diff --git a/searchform.php b/searchform.php
index 426d09b..3852996 100644
--- a/searchform.php
+++ b/searchform.php
@@ -11,8 +11,8 @@
 <form method="get" id="searchform" class="form-search" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label for="s" class="assistive-text hidden"><?php _e( 'Search', 'the-bootstrap' ); ?></label>
 	<div class="input-append">
-		<input type="search" placeholder="<?php esc_attr_e( 'Search', 'the-bootstrap' ); ?>" id="s" name="s" class="span2">
-		<button class="btn btn-primary" name="submit" id="searchsubmit" type="submit"><?php _e( 'Go', 'the-bootstrap' ); ?></button>
+		<input type="search" placeholder="<?php esc_attr_e( 'Search', 'the-bootstrap' ); ?>" id="s" name="s" class="span2"><!--
+	 --><button class="btn btn-primary" name="submit" id="searchsubmit" type="submit"><?php _e( 'Go', 'the-bootstrap' ); ?></button>
    	</div>
 </form>
 <?php
diff --git a/style.css b/style.css
index 77fd6b7..dafdd39 100644
--- a/style.css
+++ b/style.css
@@ -159,10 +159,6 @@ article.page {
 	margin: 0;
 }
 
-.input-append .btn {
-    margin-left: -4px;
-}
-
 .the-bootstrap-image-meta dt,
 .the-bootstrap-image-meta dd {
     float: left;
diff --git a/style.min.css b/style.min.css
index c98ca5b..caff84f 100644
--- a/style.min.css
+++ b/style.min.css
@@ -1 +1 @@
-blockquote cite:before{content:'\2014 \00A0';}blockquote cite{color:#999;display:block;font-size:13px;line-height:18px;}figure{margin:0;}h1,h2,h3,h4,h5,h6,.clear{clear:both;}.sidebar-content #primary{float:right;margin:0 20px 0 0;}.assistive-text{clip:rect(1px,1px,1px,1px);position:absolute !important;}.container{margin:18px auto;}#page{background-color:#fff;margin-right:-20px;padding:14px 0 0;}#branding hgroup{margin-bottom:18px;}.page-header{margin:0 0 18px;}.entry-content{margin-bottom:18px;}#author-info,article.post,article.page{margin-bottom:72px;}.page-header,.entry-content{word-wrap:break-word;}.post-password-form legend{font-size:inherit;}.entry-attachment{margin-bottom:36px;}.entry-attachment figure{display:table;margin:0 auto;}#comments-title{border-bottom:1px solid #eee;font-size:19.5px;margin:0 0 27px;}#comment,.entry-content iframe,.entry-content embed{max-width:100%;}.commentlist>li{margin-bottom:36px;}.commentlist ul.children{margin:10px 0 18px;list-style:none;}#reply-title{position:relative;}#reply-title small{position:absolute;right:0;top:7px;}.form-search{margin:0;}.input-append .btn{margin-left:-4px;}.the-bootstrap-image-meta dt,.the-bootstrap-image-meta dd{float:left;width:48%;}.thumbnail>img{width:100%;}header img,.entry-content img,.comment-content img,.widget img{max-width:100%;}img[class*="align"],img[class*="wp-image-"],img[class*="attachment-"]{height:auto;}img.wp-smiley{border:none;margin-bottom:0;margin-top:0;padding:0;}#colophon .nav-pills{margin:0;}#site-generator{float:right;font-family:Georgia,"Bitstream Charter",serif;font-style:italic;}#site-generator a{background:url("images/wordpress.png") no-repeat scroll left center transparent;color:#787878;display:inline-block;line-height:16px;padding-left:20px;text-decoration:none;}#site-generator.footer-nav-menu a{margin-top:10px;}table .label{background-color:transparent;border-radius:none;color:inherit;font-size:inherit;text-transform:inherit;}#comment,.thumbnail{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}.label .post-edit-link,.label .comment-edit-link{color:#fff;}.navbar .btn,.navbar .btn-group{margin:5px;}.navbar-search{height:34px;}.pagination span{background-color:#f5f5f5;border:1px solid #ddd;border-left-width:0;color:#999;cursor:default;float:left;line-height:34px;padding:0 14px;}.pagination span.dots,.pagination a{background-color:#fff;}.pagination li:first-child span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}.alignnone{margin:5px 20px 20px 0;}.aligncenter,div.aligncenter{display:block;margin:0 auto 20px;}.alignright{float:right;margin:0 0 20px 20px;}.alignleft{float:left;margin:0 20px 20px 0;}a img.alignright{margin:5px 0 20px 20px;}a img.alignnone{margin:5px 20px 20px 0;}a img.alignleft{margin:5px 20px 20px 0;}.wp-caption{max-width:100%;}.wp-caption .wp-caption-text,.gallery-caption,.entry-caption{padding:0 9px 9px;text-align:center;}.wp-caption .wp-caption-text{padding-top:9px;}.wp-caption.alignnone{margin:5px 20px 20px 0;}.wp-caption.alignleft{margin:5px 20px 20px 0;}.wp-caption.alignright{margin:5px 0 20px 20px;}.wp-caption.aligncenter{text-align:center;}.sticky{}.bypostauthor{}@media(max-width:767px){body{padding:0;}.container{width:auto;padding:0 10px;}#page{margin:0;padding:10px;}.sidebar-content #primary{float:none;margin:inherit;}#s{display:inline-block;}#site-generator,#site-generator.footer-nav-menu a{float:none;margin-top:5px;}textarea[class*="span"]{height:auto;}}@media(min-width:1200px){#page{margin-right:-30px;padding:24px 0 10px;}.sidebar-content #primary{margin-right:30px;}.wp-caption{display:table;}}
\ No newline at end of file
+blockquote cite:before{content:'\2014 \00A0';}blockquote cite{color:#999;display:block;font-size:13px;line-height:18px;}figure{margin:0;}h1,h2,h3,h4,h5,h6,.clear{clear:both;}.sidebar-content #primary{float:right;margin:0 20px 0 0;}.assistive-text{clip:rect(1px,1px,1px,1px);position:absolute !important;}.container{margin:18px auto;}#page{background-color:#fff;margin-right:-20px;padding:14px 0 0;}#branding hgroup{margin-bottom:18px;}.page-header{margin:0 0 18px;}.entry-content{margin-bottom:18px;}#author-info,article.post,article.page{margin-bottom:72px;}.page-header,.entry-content{word-wrap:break-word;}.post-password-form legend{font-size:inherit;}.entry-attachment{margin-bottom:36px;}.entry-attachment figure{display:table;margin:0 auto;}#comments-title{border-bottom:1px solid #eee;font-size:19.5px;margin:0 0 27px;}#comment,.entry-content iframe,.entry-content embed{max-width:100%;}.commentlist>li{margin-bottom:36px;}.commentlist ul.children{margin:10px 0 18px;list-style:none;}#reply-title{position:relative;}#reply-title small{position:absolute;right:0;top:7px;}.form-search{margin:0;}.the-bootstrap-image-meta dt,.the-bootstrap-image-meta dd{float:left;width:48%;}.entry-content .post-thumbnail{margin:0 20px 20px 0;}.thumbnail>img{width:100%;}header img,.entry-content img,.comment-content img,.widget img{max-width:100%;}img[class*="align"],img[class*="wp-image-"],img[class*="attachment-"]{height:auto;}img.wp-smiley{border:none;margin-bottom:0;margin-top:0;padding:0;}#colophon .nav-pills{margin:0;}#site-generator{float:right;font-family:Georgia,"Bitstream Charter",serif;font-style:italic;}#site-generator a{background:url("images/wordpress.png") no-repeat scroll left center transparent;color:#787878;display:inline-block;line-height:16px;padding-left:20px;text-decoration:none;}#site-generator.footer-nav-menu a{margin-top:10px;}table .label{background-color:transparent;border-radius:none;color:inherit;font-size:inherit;text-transform:inherit;}#comment,.thumbnail{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}.label .post-edit-link,.label .comment-edit-link{color:#fff;}.navbar .btn,.navbar .btn-group{margin:5px;}.navbar-search{height:34px;}.pagination span{background-color:#f5f5f5;border:1px solid #ddd;border-left-width:0;color:#999;cursor:default;float:left;line-height:34px;padding:0 14px;}.pagination span.dots,.pagination a{background-color:#fff;}.pagination li:first-child span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}.alignnone{margin:5px 20px 20px 0;}.aligncenter,div.aligncenter{display:block;margin:0 auto 20px;}.alignright{float:right;margin:0 0 20px 20px;}.alignleft{float:left;margin:0 20px 20px 0;}a img.alignright{margin:5px 0 20px 20px;}a img.alignnone{margin:5px 20px 20px 0;}a img.alignleft{margin:5px 20px 20px 0;}.wp-caption{max-width:100%;}.wp-caption .wp-caption-text,.gallery-caption,.entry-caption{padding:0 9px 9px;text-align:center;}.wp-caption .wp-caption-text{padding-top:9px;}.wp-caption.alignnone{margin:5px 20px 20px 0;}.wp-caption.alignleft{margin:5px 20px 20px 0;}.wp-caption.alignright{margin:5px 0 20px 20px;}.wp-caption.aligncenter{text-align:center;}.sticky{}.bypostauthor{}@media(max-width:767px){body{padding:0;}.container{width:auto;padding:0 10px;}#page{margin:0;padding:10px;}.sidebar-content #primary{float:none;margin:inherit;}#s{display:inline-block;}#site-generator,#site-generator.footer-nav-menu a{float:none;margin-top:5px;}textarea[class*="span"]{height:auto;}}@media(min-width:1200px){#page{margin-right:-30px;padding:24px 0 10px;}.sidebar-content #primary{margin-right:30px;}.wp-caption{display:table;}}
\ No newline at end of file