diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
index 67236a7e4..f85739b6a 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
@@ -590,7 +590,7 @@
       </div>
     </fieldset>
 
-    <div class="row fileupload-buttonbar">
+    <div class="row-fluid fileupload-buttonbar">
       <div class="span7">
         <span class="btn btn-success fileinput-button">
           <i class="icon-plus icon-white"></i>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
index d0b15cc37..12e54a3c0 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
@@ -811,7 +811,7 @@
                      value: proxyConnector.targetRepoId,attr: {disabled: isUpdate() }"></select>
           </div>
         </div>
-        <div class="row">
+        <div class="row-fluid">
           <div class="control-group span6">
             <table class="table">
               <thead>
@@ -830,7 +830,7 @@
             </table>
           </div>
         </div>
-        <div class="row">
+        <div class="row-fluid">
           <div class="control-group span6">
             <h4>${$.i18n.prop('proxy-connector.properties')}</h4>
             <table class="table">
@@ -849,7 +849,7 @@
             </table>
           </div>
         </div>
-        <div class="row">
+        <div class="row-fluid">
           <div class="control-group span6">
             <h4>${$.i18n.prop('proxy-connector.blacklist')}</h4>
             <table class="table">
@@ -866,7 +866,7 @@
             </table>
           </div>
         </div>
-        <div class="row">
+        <div class="row-fluid">
           <div class="control-group span6">
             <h4>${$.i18n.prop('proxy-connector.whitelist')}</h4>
             <table class="table">
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
index 5594e85ad..8af92748d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
@@ -339,12 +339,11 @@
 
 
       <div id="search-results" class="tab-pane">
-        <div class="row">
-          <div class="span3">
+        <div class="row-fluid">
+          <div class="span6">
             <a href="#" class="btn btn-warning" data-bind="click: removeFilter" id="remove-filter-id">${$.i18n.prop('search.artifact.result.filter')}</a>
           </div>
-          <div class="span4" id="search-result-number-div">
-
+          <div class="span6" id="search-result-number-div">
           </div>
         </div>
         <table class="table table-striped table-bordered" id="search-results-grid">
@@ -808,7 +807,7 @@
 </script>
 
 <script id="artifact-details-files-content_tmpl" type="text/html">
-      <div class="row">
+      <div class="row-fluid">
         <div class="span4">
            <ul id="artifact-content-list-files">
            {{each artifactDownloadInfos}}