diff --git a/front-ui/Gruntfile.js b/front-ui/Gruntfile.js
index 32fbb51..d81ca2e 100644
--- a/front-ui/Gruntfile.js
+++ b/front-ui/Gruntfile.js
@@ -23,16 +23,16 @@ module.exports = function(grunt) {
             server: {
                 options: {
                     port: 3001,
-                    base: 'build'//,
-                    // middleware: function(connect, options) {
-                    //     return [
-                    //         function(req, res) {
-                    //             var filename = 'build/' + req.url;
-                    //             if ((filename === 'build//') || !grunt.file.exists(filename)) filename = 'build/index.html';
-                    //             res.end(grunt.file.read(filename));
-                    //         }
-                    //     ];
-                    // },
+                    base: 'build',
+                    middleware: function(connect, options) {
+                        return [
+                            function(req, res) {
+                                var filename = 'build/' + req.url;
+                                if ((filename === 'build//') || !grunt.file.exists(filename)) filename = 'build/index.html';
+                                res.end(grunt.file.read(filename));
+                            }
+                        ];
+                    },
                 }
             }
         },
diff --git a/front-ui/app/components/cart/addToCart.js b/front-ui/app/components/cart/addToCart.js
index 660f8d9..2c8ffa8 100644
--- a/front-ui/app/components/cart/addToCart.js
+++ b/front-ui/app/components/cart/addToCart.js
@@ -13,10 +13,9 @@ var AddToCart = React.createClass({
       var itemCount = this.state.count;
       var amountAndAddButton = (
           <div className="row-fluid add-to-cart">
-            <div className="span12">
-              <div style={buttonHolderStyle}><button className="btn white_button"  onClick={this._onDecreaseClick}>-</button></div>
-              <div style={buttonHolderStyle}> <div className="add-to-cart-count">{ itemCount }</div> </div>
-              <div style={buttonHolderStyle}><button className="btn white_button" onClick={this._onIncreaseClick}>+</button></div>
+            <div className="col-lg-12">
+              <button className="btn white_button"  onClick={this._onDecreaseClick}>-</button><span className='add-to-cart-count'>{itemCount}</span>
+              <button className="btn white_button" onClick={this._onIncreaseClick}>+</button>
             </div>
             <div>
             <div style={buttonHolderStyle}><button className="btn add-to-cart-button" onClick={this._addToCartClick}>Dodaj na popis za kupovinu</button></div>
diff --git a/front-ui/app/css/cart.css b/front-ui/app/css/cart.css
index eb15eea..75270ca 100644
--- a/front-ui/app/css/cart.css
+++ b/front-ui/app/css/cart.css
@@ -1,13 +1,16 @@
 .add-to-cart {
-	padding-top: 20px;      
+	padding-top: 20px;
 }
 
 .add-to-cart-count {
 	font-size: 20px;
-	margin-top-top: 10px;
-	width: 50px;
-	text-align: center;
-	vertical-align: bottom; 
+	padding-left: 10px;
+	padding-right: 10px;
+	vertical-align: middle;
+	/*margin-top-top: 10px;*/
+	/*width: 50px;*/
+	/*text-align: center;*/
+	/*vertical-align: bottom; */
 }
 
 .shopping-cart-icon {
@@ -19,7 +22,7 @@
 
 .shopping-cart-notification-text {
 	display: inline-block;
-	background:red; 
+	background:red;
 	color: white;
     font-size: 9px;
     position: absolute;
@@ -42,4 +45,4 @@
    	font-size: 17px;
    	padding-top: 10px;
    	padding-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/front-ui/app/css/main.css b/front-ui/app/css/main.css
index f0658b1..7f36bfb 100644
--- a/front-ui/app/css/main.css
+++ b/front-ui/app/css/main.css
@@ -483,7 +483,7 @@ text-decoration: none;
     width: 40px;
     height: 40px;
     padding-bottom: 7px;
-    display: block;
+    /*display: block;*/
     border-radius: 1px;
     margin-top: 8px;
     border: solid #cccccc 1px;