diff --git a/front-ui/app/components/cart/checkoutPage.js b/front-ui/app/components/cart/checkoutPage.js
index 421caa8..cbd1af6 100644
--- a/front-ui/app/components/cart/checkoutPage.js
+++ b/front-ui/app/components/cart/checkoutPage.js
@@ -205,12 +205,19 @@ var CheckoutPage = React.createClass({
 
               </p>
 
+              <div className="hidden-xs">
+              <button className="btn btn-default gift-btn" onClick={this._onGiftBtnClicked}>Poklon</button>
+              <br />
+
+              <p className="collapsed-address-container">{last_used_payment} ili <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni način plaćanja ili adresu</button></p>
+              </div>
+
+              <div className="collapsed-address-container-mobile btn-group-vertical visible-xs">
               <button className="btn btn-default" onClick={this._onGiftBtnClicked}>Poklon</button>
+              {last_used_payment}
+              <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni način plaćanja ili adresu</button>
+              </div>
 
-              <br /><br />
-
-              <p className="collapsed_address_container">{last_used_payment} ili <button className="btn btn-default" onClick={this._onUncolapseClick}>Promijeni način plaćanja ili adresu</button>
-                </p>
                 <div className="form-group">
                   <label className="col-md-4 control-label" htmlFor="order"></label>
                   <div className="col-md-8">
diff --git a/front-ui/app/css/checkout.css b/front-ui/app/css/checkout.css
index 253878a..890ea86 100644
--- a/front-ui/app/css/checkout.css
+++ b/front-ui/app/css/checkout.css
@@ -15,7 +15,19 @@
 	margin-bottom: 6px !important;
 }
 
-.collapsed_address_container .mybutton {
+.collapsed-address-container .mybutton {
 	margin-top: 0px !important;
 	width: 240px;
 }
+
+.collapsed-address-container-mobile button {
+	margin-bottom: 6px !important;
+	margin-left: 10% !important;
+	margin-right: 10% !important;
+	width: 80% !important;
+}
+
+.gift-btn {
+	width: 200px;
+	margin-bottom: 10px;
+}