diff --git a/front-ui/app/components/cart/cartPage.js b/front-ui/app/components/cart/cartPage.js
index 7820029..2d48545 100644
--- a/front-ui/app/components/cart/cartPage.js
+++ b/front-ui/app/components/cart/cartPage.js
@@ -65,7 +65,6 @@ var CartPage = React.createClass({
 
       var cartTotal = (
         <div>
-
         <div className="row cart-total">
           <div className="col-lg-6">Ukupno</div>
            <div className="col-lg-6">
@@ -82,21 +81,14 @@ var CartPage = React.createClass({
       );
 
       var buySomethingMessage = (<div></div>);
+      var content;
 
-      if (this.state.items.length <= 0) {
+      if (displayedItems.length <= 0) {
         cartTotal = (<div></div>)
         buySomethingMessage = (<div>Nemate ni jedan artikal u vašoj korpi. Kada vidite nešto što vam se sviđa - pritisnite dugme KUPI pored artikla kako biste ga dodali u korpu. </div>)
-
-      };
-
-
-
-      return (
-
-        <div className="col-lg-12">
-          <LinkBanner locationName="thankYouPage" />
-           <div className="cart-title">KORPA</div>
-
+        content = buySomethingMessage;
+      } else {
+        content = (<div>
            <table className="table">
              <thead>
                <tr>
@@ -114,6 +106,17 @@ var CartPage = React.createClass({
            </table>
            {buySomethingMessage}
            {cartTotal}
+        </div>)
+      }
+
+
+
+      return (
+        <div className="col-lg-12">
+          <LinkBanner locationName="thankYouPage" />
+           <div className="cart-title">KORPA</div>
+           {content}
+
         </div>
         );