diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 1447a93ae..c105332f8 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -142,14 +142,19 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
             <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
             <input type="hidden" name="action" value="delete"/>
             <input type="hidden" name="object" value="server"/>
+            <div id="contentButtons">
+              <button type="button" id="NewServerBtn" value="<?php echo translate('AddNewServer') ?>" disabled="disabled"><?php echo translate('AddNewServer') ?></button>
+              <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
+            </div>
             <table id="contentTable" class="table table-striped">
               <thead class="thead-highlight">
                 <tr>
+                  <th class="colMark"><?php echo translate('Mark') ?></th>
                   <th class="colName"><?php echo translate('Name') ?></th>
                   <th class="colUrl"><?php echo translate('Url') ?></th>
                   <th class="colPathToIndex"><?php echo translate('PathToIndex') ?></th>
                   <th class="colPathToZMS"><?php echo translate('PathToZMS') ?></th>
-                  <th class="colPathToApi"><?php echo translate('PathToApi') ?></th>
+                  <th class="colPathToAPI"><?php echo translate('PathToApi') ?></th>
                   <th class="colStatus"><?php echo translate('Status') ?></th>
                   <th class="colMonitorCount"><?php echo translate('Monitors') ?></th>
                   <th class="colCpuLoad"><?php echo translate('CpuLoad') ?></th>
@@ -159,7 +164,6 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
                   <th class="colAudit"><?php echo translate('RunAudit') ?></th>
                   <th class="colTrigger"><?php echo translate('RunTrigger') ?></th>
                   <th class="colEventNotification"><?php echo translate('RunEventNotification') ?></th>
-                  <th class="colMark"><?php echo translate('Mark') ?></th>
                 </tr>
               </thead>
               <tbody>
@@ -169,6 +173,7 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
             $svr_opt = 'class="serverCol" data-sid="'.$Server->Id().'"';
             ?>
                 <tr>
+                  <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
                   <td class="colName"><?php echo makeLink('#', validHtmlStr($Server->Name()), $canEdit, $svr_opt ) ?></td>
                   <td class="colUrl"><?php echo makeLink('#', validHtmlStr($Server->Url()), $canEdit, $svr_opt ) ?></td>
                   <td class="colPathToIndex"><?php echo makeLink('#', validHtmlStr($Server->PathToIndex()), $canEdit, $svr_opt ) ?></td>
@@ -186,16 +191,10 @@ foreach (array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as $
                   <td class="colAudit"><?php echo makeLink('#', $Server->zmaudit() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
                   <td class="colTrigger"><?php echo makeLink('#', $Server->zmtrigger() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
                   <td class="colEventNotification"><?php echo makeLink('#', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
-
-                  <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
                 </tr>
 <?php } #end foreach Server ?>
               </tbody>
             </table>
-            <div id="contentButtons">
-              <button type="button" id="NewServerBtn" value="<?php echo translate('AddNewServer') ?>" disabled="disabled"><?php echo translate('AddNewServer') ?></button>
-              <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
-            </div>
           </form>
 <?php
 } else if ($tab == 'storage') {