diff --git a/web/skins/classic/css/classic/skin.css b/web/skins/classic/css/classic/skin.css
index f8801157d..28438471f 100644
--- a/web/skins/classic/css/classic/skin.css
+++ b/web/skins/classic/css/classic/skin.css
@@ -190,12 +190,6 @@ ul.tabList li.active a {
     vertical-align: middle;
 }
 
-#content table.major th, #content table.major td {
-    border: 1px solid #7f7fb2;
-    padding: 3px;
-    text-align: left;
-}
-
 #content table.major th {
     vertical-align: bottom;
 }
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 1140b7bfd..85a4036e4 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -59,14 +59,14 @@ xhtmlHeaders( __FILE__, translate('Options') );
       <h2><?php echo translate('Options') ?></h2>
     </div>
     <div id="content">
-      <ul class="tabList">
+      <ul class="nav nav-tabs">
 <?php
 foreach ( $tabs as $name=>$value )
 {
     if ( $tab == $name )
     {
 ?>
-        <li class="active"><?php echo $value ?></li>
+        <li class="active"><a href="?view=<?php echo $view ?>&amp;tab=<?php echo $name ?>"><?php echo $value ?></a></li>
 <?php
     }
     else
@@ -103,7 +103,7 @@ if($tab == 'skins') {
 	<form name="optionsForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-		<table class="contentTable major optionTable" cellspacing="0">
+		<table class="table table-striped" cellspacing="0">
 			<thead><tr><th><?php echo translate('Name') ?></th><th><?php echo translate('Description') ?></th> <th><?php echo translate('Value') ?></th></tr></thead>
 			<tbody>
 				<tr>
@@ -147,7 +147,7 @@ elseif ( $tab == "users" )
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
         <input type="hidden" name="action" value="delete"/>
-        <table id="contentTable" class="major userTable" cellspacing="0">
+        <table id="contentTable" class="table table-striped" cellspacing="0">
           <thead>
             <tr>
               <th class="colUsername"><?php echo translate('Username') ?></th>
@@ -215,7 +215,7 @@ elseif ( $tab == "users" )
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
         <input type="hidden" name="action" value="delete"/>
         <input type="hidden" name="object" value="server"/>
-        <table id="contentTable" class="major serversTable" cellspacing="0">
+        <table id="contentTable" class="table table-striped" cellspacing="0">
           <thead>
             <tr>
               <th class="colName"><?php echo translate('name') ?></th>
@@ -251,7 +251,7 @@ elseif ( $tab == "users" )
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
         <input type="hidden" name="action" value="options"/>
-        <table id="contentTable" class="major optionTable" cellspacing="0">
+        <table id="contentTable" class="table table-striped" cellspacing="0">
           <thead>
             <tr>
               <th><?php echo translate('Name') ?></th>