diff --git a/css/styles.css b/css/styles.css
index 94dbaee..244196c 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -1,46 +1,47 @@
-.btn-group .btn:first-child {
-	border-bottom-left-radius: 0;
-}
-
-.btn-group .btn:last-child, .input-prepend input {
-	border-bottom-right-radius: 0;
-}
-
-.btn-group .btn {
-	border-bottom: 0;
-}
-
-.btn-group .input-prepend .btn {
-	border-left: 0;
-}
-
 .label {
-	position: relative;
-	bottom: 4px;
 }
 
-pre, .btn-group .input-prepend .btn {
-	border-top-left-radius: 0;
-}
 
 .container {
 	margin: 20px auto;
 }
 
-.nav {
-	padding-top: 8px;
-	margin-top: 10px;
-	margin-left: -50px;
-}
-
 .loading {
 	background-image: url(../img/ajax-loader.gif);
 	background-repeat: no-repeat;
 	padding-left: 20px;
 }
 
-.input-prepend {
-	margin-bottom: 0;
-	position: relative;
-	top: 1px;
+.toolbar-top {
+}
+.toolbar-top .btn {
+    border-bottom: 0;
+    border-radius: 0;
+}
+.toolbar-top .btn:first-child {
+    border-top-left-radius: 4px;
+}
+.toolbar-top .btn:last-child {
+    border-top-right-radius: 4px;
+}
+
+pre {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+    margin: 0;
+}
+
+.toolbar-bottom {
+    margin-top: -1px;
+}
+.toolbar-bottom .input-append {
+    display: block;
+    padding-right: 50px;
+}
+.toolbar-bottom .input-block-level {
+    box-sizing: border-box;
+}
+.toolbar-bottom .btn {
+    width:50px;
 }
diff --git a/index.php b/index.php
index 1452361..fad2ec4 100644
--- a/index.php
+++ b/index.php
@@ -33,7 +33,7 @@ global $servers;
 							<section id="<?php echo $id; ?>">
 								<h4><?php echo $param['title']; ?></h4>
                                 <div class="pull-right"><span class="label"></span></div>
-								<div class="btn-group">
+								<div class="btn-group toolbar-top">
 									<button class="btn" onclick="callRequest('status', '<?php echo $id; ?>');">
 										<i class="icon-refresh"></i> Status
 									</button>
@@ -42,7 +42,7 @@ global $servers;
 									</button>
 								</div>
 								<pre></pre>
-                                <div class="control-group">
+                                <div class="control-group toolbar-bottom">
                                     <div class="controls">
                                         <div class="input-append">
                                             <input class="input-block-level" type="text" name="message" placeholder="Commit message">