diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/modal.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/modal.html
index 766389343..890d1abf2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/modal.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/modal.html
@@ -18,7 +18,7 @@
 -->
 <div id="dialog-confirm-modal" class="modal hide fade" style="display: block;">
   <div class="modal-header">
-    <a class="close" href="#">&#215;</a>
+    <a class="close" href="#" data-dismiss="modal">&#215;</a>
     <h3 id="dialog-confirm-modal-header-title"></h3>
   </div>
   <div class="modal-body">
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
index a517d1843..b0ceb2f8a 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
@@ -32,7 +32,7 @@ <h2>${$.i18n.prop('network-proxies.list')}</h2>
   <div id="network-proxies-view-tabs-content" class="tab-content">
     <div id="network-proxies-view" class="active">
         <div id="network-proxies-bulk-save-btn" data-bind='template:{name:"network-proxies-bulk-save-tmpl"}'></div>
-        <table class="bordered-table zebra-striped" id="networkProxiesTable"
+        <table class="table table-striped table-bordered" id="networkProxiesTable"
                data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-network-proxies-grid',pageLinksId:'network-proxiesPagination'">
         </table>
         <div id="network-proxiesPagination"></div>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
index a50422086..3567effdd 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
@@ -31,7 +31,7 @@ <h2>${$.i18n.prop('proxy-connectors.list')}</h2>
   </ul>
   <div id="proxy-connectors-view-tabs-content" class="tab-content">
     <div id="proxy-connectors-view" class="active">
-      <table class="bordered-table zebra-striped" id="proxyConnectorsTable"
+      <table class="table table-striped table-bordered" id="proxyConnectorsTable"
              data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-proxy-connectors-grid',pageLinksId:'proxy-connectorsPagination'">
       </table>
       <div id="proxy-connectorsPagination"></div>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
index 04878e6cd..d3654e212 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
@@ -41,7 +41,7 @@ <h2>${$.i18n.prop('administration.repositories')}</h2>
             </ul>
             <div id="managed-repositories-tabs-content" class="pill-content">
               <div id="managed-repositories-view" class="active">
-                  <table class="bordered-table zebra-striped" id="managed-repositories-table"
+                  <table class="table table-striped table-bordered" id="managed-repositories-table"
                          data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_managed-repositoriesGrid',pageLinksId:'managed-repositoriesPagination',data:'managedRepositories'">
                   </table>
                   <div id="managed-repositoriesPagination"></div>
@@ -64,7 +64,7 @@ <h2>${$.i18n.prop('administration.repositories')}</h2>
             </ul>
             <div id="remote-repositories-tabs-content" class="pill-content">
               <div id="remote-repositories-view" class="active">
-                  <table class="bordered-table zebra-striped" id="remote-repositories-table"
+                  <table class="table table-striped table-bordered" id="remote-repositories-table"
                          data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_remote-repositoriesGrid',pageLinksId:'remote-repositoriesPagination',data:'remoteRepositories'">
                   </table>
                   <div id="remote-repositoriesPagination"></div>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
index e22b125c3..b29a53304 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
@@ -31,7 +31,7 @@ <h2>${$.i18n.prop('roles.management.header')}</h2>
   </ul>
   <div id="roles-view-tabs-content" class="tab-content">
     <div id="roles-view">
-        <table class="bordered-table zebra-striped" id="usersTable"
+        <table class="table table-striped table-bordered" id="usersTable"
                data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_rolesGrid',pageLinksId:'rolesPagination'">
         </table>
         <div id="rolesPagination"></div>
@@ -92,7 +92,7 @@ <h3>${$.i18n.prop('role.model.child.roles')}</h3>
     <h3>${$.i18n.prop('permissions')}</h3>
   </div>
   {{if $data.permissions}}
-    <table class="bordered-table zebra-striped" id="rolePermissionsTable">
+    <table class="table table-striped table-bordered" id="rolePermissionsTable">
       <thead>
         <tr>
           <th>${$.i18n.prop('name')}</th>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
index 900a6eaa4..e92d9da97 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
@@ -106,7 +106,7 @@ <h2>${$.i18n.prop('users.list')}</h2>
         <button data-bind='click: sortByName'  class="btn">
             ${$.i18n.prop('users.sort.byname')}
         </button>
-        <table class="bordered-table zebra-striped" id="usersTable"
+        <table class="table table-striped table-bordered" id="usersTable"
                data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_usersGrid_grid',pageLinksId:'usersPagination'">
         </table>
         <div id="usersPagination"></div>