diff --git a/public/css/style.less b/public/css/style.less
index af5fb49f18..484ea34e1c 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -536,13 +536,14 @@ body .navbar .nodebb-inline-block {
 		}
 
 		input {
-			width: 100%;
+			width: 98%;
 			text-align: center;
 			border: none;
 			padding: 0.5em 0;
 			-webkit-border-radius: 0px;
 			-moz-border-radius: 0px;
 			border-radius: 0px;
+			margin: 1% 1% 2% 1%;
 		}
 
 		textarea {
@@ -551,10 +552,10 @@ body .navbar .nodebb-inline-block {
 			padding: 0.5em;
 			display: block;
 			width: 90%;
-			margin: 1em auto;
+			margin: 0.5em auto;
 			resize: none;
 			color: white;
-			height: 230px;
+			height: 200px;
 		}
 		
 		#imagedrop {
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 3e97fdb92d..fec1ce41c5 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -95,17 +95,19 @@ define(['taskbar'], function(taskbar) {
 															'<span class="btn btn-link" tabindex="-1"><i class="icon-list"></i></span>' +
 															'<span class="btn btn-link" tabindex="-1"><i class="icon-link"></i></span>' +
 														'</div>' +
-														'<div class="btn-group action-bar" style="float: right; margin-right: -12px">' +
-															'<button data-action="post" class="btn" tabIndex="3"><i class="icon-ok"></i> Submit</button>' +
-															'<button data-action="minimize" class="btn hidden-phone" tabIndex="4"><i class="icon-download-alt"></i> Minimize</button>' +
-															'<button class="btn" data-action="discard" tabIndex="5"><i class="icon-remove"></i> Discard</button>' +
-														'</div>' +
 													'</div>' +
 													'<div style="position:relative;">'+
 														'<div id="imagedrop" class=""><div>Drag and Drop Images Here</div></div>'+
 														'<textarea tabIndex="2"></textarea>' +
 														'<div id="imagelist"></div>'+
 													'</div>'+
+													'<div class="btn-toolbar">' +
+														'<div class="btn-group action-bar" style="float: right; margin-right: -8px">' +
+															'<button data-action="minimize" class="btn hidden-phone" tabIndex="4"><i class="icon-download-alt"></i> Minimize</button>' +
+															'<button class="btn" data-action="discard" tabIndex="5"><i class="icon-remove"></i> Discard</button>' +
+															'<button data-action="post" class="btn" tabIndex="3"><i class="icon-ok"></i> Submit</button>' +
+														'</div>' +
+													'</div>' +
 												'</div>';
 
 			document.body.insertBefore(composer.postContainer, taskbar);