diff --git a/assets/css/main.css b/assets/css/main.css
index 83381ca..5f9723e 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -28,3 +28,7 @@ body {
 .container .text-muted {
   margin: 20px 0;
 }
+
+.margin-left-10px {
+	margin-left: 10px
+}
diff --git a/inc/session.inc.php b/inc/session.inc.php
index 7354b7c..f8a9e08 100644
--- a/inc/session.inc.php
+++ b/inc/session.inc.php
@@ -282,7 +282,7 @@ function initialize_session() {
                                            array('db_meta',    $ptitle_strings['db_meta'],    'close')),
 
               // panels on the Tables page
-              's_tables_panels'   => array(array('tb_show',    $ptitle_strings['tb_show'],    'close'),
+              's_tables_panels'   => array(array('tb_show',    $ptitle_strings['tb_show'],    'open'),
                                            array('tb_create',  $ptitle_strings['tb_create'],  'close'),
                                            array('tb_modify',  $ptitle_strings['tb_modify'],  'close'),
                                            array('tb_delete',  $ptitle_strings['tb_delete'],  'close')),
@@ -301,17 +301,17 @@ function initialize_session() {
                                             array('tb_watch',  $ptitle_strings['tb_watch'],   'close')),
 
               // panels on the Data page
-              's_data_panels'      => array(array('dt_enter',  $ptitle_strings['dt_enter'],   'close'),
+              's_data_panels'      => array(array('dt_enter',  $ptitle_strings['dt_enter'],   'open'),
                                             array('tb_watch',  $ptitle_strings['tb_watch'],   'close'),
                                             array('dt_export', $ptitle_strings['dt_export'],  'close'),
                                             array('dt_import', $ptitle_strings['dt_import'],  'close')),
               // panels on the User page
-              's_users_panels'      => array(array('usr_user', $ptitle_strings['usr_user'],   'close'),
+              's_users_panels'      => array(array('usr_user', $ptitle_strings['usr_user'],   'open'),
                                              array('usr_role', $ptitle_strings['usr_role'],   'close'),
 //                                              array('usr_grant',$ptitle_strings['usr_grant'],'close')),
                                              array('usr_cust', $ptitle_strings['usr_cust'],   'close')),
               // panels on the Admin page
-              's_admin_panels'      => array(array('adm_server',$ptitle_strings['adm_server'],'close'),
+              's_admin_panels'      => array(array('adm_server',$ptitle_strings['adm_server'],'open'),
                                              array('adm_dbstat',$ptitle_strings['adm_dbstat'],'close'),
                                              array('adm_gfix',  $ptitle_strings['adm_gfix'],  'close'),
                                              array('adm_backup',$ptitle_strings['adm_backup'],'close'),
diff --git a/panels/adm_backup.php b/panels/adm_backup.php
index 396ebfa..5e6c7f7 100644
--- a/panels/adm_backup.php
+++ b/panels/adm_backup.php
@@ -8,93 +8,111 @@
 
 if ($s_connected == TRUE):
 
-?>
-<form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="adm_backup">
-<?php
-
-    if ($s_login['user'] != 'SYSDBA') {
-        sysdba_pw_textfield($adm_strings['SysdbaPW'], $adm_strings['Required'], $s_sysdba_pw);
-    }
-
-?>
-<table class="table table-bordered">
-<tr>
-   <th colspan="2" align="left"><?php echo $adm_strings['BTarget']; ?></th>
-</tr>
-<tr>
-   <td>
-      <?php echo $adm_strings['FDName']; ?>
-   </td>
-   <td>
-      <?php if (defined('BACKUP_DIR')  &&  BACKUP_DIR !== '') echo BACKUP_DIR.'<br>'; ?>
-      <?php echo get_textfield('adm_bu_target', 50, 256, $s_backup['target']); ?>
-   </td>
-</tr>
-</table>
-
-<table class="table table-bordered">
-<tr>
-   <th colspan="2" align="left"><?php echo $adm_strings['Options']; ?></th>
-</tr>
-<tr>
-   <td>
-      <input type="checkbox" name="adm_bu_mdonly" value="1"<?php if ($s_backup['mdonly'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BMDOnly']; ?>&nbsp;
-   </td>
-   <td>
-      <input type="checkbox" name="adm_bu_nogc" value="1"<?php if ($s_backup['nogc'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BNoGC']; ?>&nbsp;
-   </td>
-</tr>
-<tr>
-   <td>
-      <input type="checkbox" name="adm_bu_mdoldstyle" value="1"<?php if ($s_backup['mdoldstyle'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BMDOStyle']; ?>&nbsp;
-   </td>
-   <td>
-      <input type="checkbox" name="adm_bu_ignorecs" value="1"<?php if ($s_backup['ignorecs'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BIgnoreCS']; ?>&nbsp;
-   </td>
-</tr>
-<tr>
-   <td>
-      <input type="checkbox" name="adm_bu_transport" value="1"<?php if ($s_backup['transport'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BTransport']; ?>&nbsp;
-   </td>
-   <td>
-      <input type="checkbox" name="adm_bu_ignorelt" value="1"<?php if ($s_backup['ignorelt'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BIgnoreLT']; ?>&nbsp;
-   </td>
-</tr>
-<tr>
-   <td>
-      <input type="checkbox" name="adm_bu_convert" value="1"<?php if ($s_backup['convert'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['BConvert']; ?>&nbsp;
-   </td>
-   <td>
-      <input type="checkbox" name="adm_bu_verbose" value="1"<?php if ($s_backup['verbose'] == TRUE) echo ' checked'; ?>>
-      <?php echo $adm_strings['Verbose']; ?>&nbsp;
-   </td>
-</tr>
-</table>
-<?php
-
-if (isset($iframekey_backup)):
-?>
+    ?>
+    <form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="adm_backup" class="form-inline">
+        <?php
 
-<br />
-<div class="if">
-  <iframe src="<?php echo url_session('./iframe_content.php?key='.$iframekey_backup); ?>" width="98%" height="<?php echo $s_cust['iframeheight']; ?>" name="adm_backup_iframe"></iframe>
-</div>
-<br />
-<?php
+        if ($s_login['user'] != 'SYSDBA') {
+            sysdba_pw_textfield($adm_strings['SysdbaPW'], $adm_strings['Required'], $s_sysdba_pw);
+        }
 
-    endif;
-?>
-<input type="submit" class="btn btn-default" name="adm_backup_doit" value="<?php echo $button_strings['Backup']; ?>">
-</form>
-<?php
+        ?>
+        <table class="table table-bordered">
+            <tr>
+                <th align="left"><?php echo $adm_strings['BTarget']; ?></th>
+            </tr>
+            <tr>
+                <td>
+                    <div class="form-group">
+                        <label for="adm_bu_target"><?php echo $adm_strings['FDName']; ?></label>
 
-endif;
+                        <div class="input-group">
+                            <?php if (defined('BACKUP_DIR') && BACKUP_DIR !== '') echo '<div class="input-group-addon">' . BACKUP_DIR . '</div>'; ?>
+                            <?php echo get_textfield('adm_bu_target', 50, 256, $s_backup['target']); ?>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+        </table>
 
-?>
+        <table class="table table-bordered">
+            <tr>
+                <th colspan="2" align="left"><?php echo $adm_strings['Options']; ?></th>
+            </tr>
+            <tr>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_mdonly"
+                               value="1"<?php if ($s_backup['mdonly'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BMDOnly']; ?>
+                    </label>
+                </td>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_nogc"
+                               value="1"<?php if ($s_backup['nogc'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BNoGC']; ?>
+                    </label>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_mdoldstyle"
+                               value="1"<?php if ($s_backup['mdoldstyle'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BMDOStyle']; ?>
+                    </label>
+                </td>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_ignorecs"
+                               value="1"<?php if ($s_backup['ignorecs'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BIgnoreCS']; ?>
+                    </label>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_transport"
+                               value="1"<?php if ($s_backup['transport'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BTransport']; ?>
+                    </label>
+                </td>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_ignorelt"
+                               value="1"<?php if ($s_backup['ignorelt'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BIgnoreLT']; ?>
+                    </label>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_convert"
+                               value="1"<?php if ($s_backup['convert'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['BConvert']; ?>
+                    </label>
+                </td>
+                <td>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_bu_verbose"
+                               value="1"<?php if ($s_backup['verbose'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['Verbose']; ?>
+                    </label>
+                </td>
+            </tr>
+        </table>
+        <?php if (isset($iframekey_backup)): ?>
+            <br/>
+            <div class="if">
+                <iframe src="<?php echo url_session('./iframe_content.php?key=' . $iframekey_backup); ?>" width="98%"
+                        height="<?php echo $s_cust['iframeheight']; ?>" name="adm_backup_iframe"></iframe>
+            </div>
+            <br/>
+        <?php endif; ?>
+        <input type="submit" class="btn btn-default" name="adm_backup_doit"
+               value="<?php echo $button_strings['Backup']; ?>">
+    </form>
+<?php endif; ?>
diff --git a/panels/adm_dbstat.php b/panels/adm_dbstat.php
index 7e55656..46cbc55 100644
--- a/panels/adm_dbstat.php
+++ b/panels/adm_dbstat.php
@@ -1,4 +1,5 @@
 <?php
+
 // File           adm_dbstat.php / FirebirdWebAdmin
 // Purpose        displays the gstat output for the selected database
 // Author         Lutz Brueckner <irie@gmx.de>
@@ -6,28 +7,20 @@
 //                published under the terms of the GNU General Public Licence v.2,
 //                see file LICENCE for details
 
-if ($s_connected):
-
-?>
-<form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="db_stat_form">
-<table class="table table-bordered">
-  <tr>
-    <td>
-      <?php
-            echo '<b>'.$adm_strings['Analyze']."</b><br>\n";
+if ($s_connected) { ?>
+    <form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="db_stat_form"
+          class="form-inline">
+        <div class="form-group">
+            <?php
+            echo '<label for="db_stat_option">' . $adm_strings['Analyze'] . "</label>";
             echo get_indexed_selectlist('db_stat_option', database_statistic_options(), $s_dbstat_option); ?>
-    </td>
-    <td valign="bottom">
-      <input type="submit" class="btn btn-default" name="db_stat_select" value="<?php echo $button_strings['Select']; ?>">
-    </td>
-  </tr>
-</table>
-</form>
-<div class="if">
-  <iframe src="<?php echo url_session('./iframe_content.php?key='.$iframekey_dbstat); ?>" width="98%" height="<?php echo $s_cust['iframeheight']; ?>" name="adm_dbstat_iframe"></iframe>
-</div>
-<?php
-
-endif;
-
-?>
+        </div>
+        <input type="submit" class="btn btn-default" name="db_stat_select"
+               value="<?php echo $button_strings['Select']; ?>">
+    </form>
+    <br/>
+    <div class="if">
+        <iframe src="<?php echo url_session('./iframe_content.php?key=' . $iframekey_dbstat); ?>" width="98%"
+                height="<?php echo $s_cust['iframeheight']; ?>" name="adm_dbstat_iframe"></iframe>
+    </div>
+<?php } ?>
\ No newline at end of file
diff --git a/panels/adm_gfix.php b/panels/adm_gfix.php
index 7699bda..4bd4e99 100644
--- a/panels/adm_gfix.php
+++ b/panels/adm_gfix.php
@@ -9,7 +9,8 @@
 if ($s_connected == TRUE):
 
     ?>
-    <form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="db_gfix_form">
+    <form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="db_gfix_form"
+          class="form-inline">
         <?php
 
         echo hidden_field('gfix_doit', '1');
@@ -18,71 +19,52 @@
             sysdba_pw_textfield($adm_strings['SysdbaPW'], $adm_strings['Required'], $s_sysdba_pw);
         }
         ?>
-        <table>
+        <table class="table table-bordered">
             <tr>
                 <td>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th align="left" colspan="3"><?php echo $adm_strings['Buffers']; ?></th>
-                        <tr>
-                            <td>
-                                <?php echo get_textfield('adm_buffers', 6, 5, $s_gfix['buffers']); ?>
-                                <input type="submit" class="btn btn-default" name="adm_gfix_buffers" value="<?php echo $button_strings['Set']; ?>">
-                            </td>
-                        </tr>
-                    </table>
+
+                    <div class="form-group">
+                        <label for="adm_buffers"><?php echo $adm_strings['Buffers']; ?></label>
+                        <?php echo get_textfield('adm_buffers', 6, 5, $s_gfix['buffers']); ?>
+                    </div>
+                    <input type="submit" class="btn btn-default" name="adm_gfix_buffers"
+                           value="<?php echo $button_strings['Set']; ?>">
                 </td>
                 <td>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th align="left" colspan="3"><?php echo $adm_strings['DBDialect']; ?></th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <?php echo get_selectlist('adm_sql_dialect', array(1, 3), $s_gfix['dialect'], TRUE); ?>
-                                <input type="submit" class="btn btn-default" name="adm_gfix_dialect" value="<?php echo $button_strings['Set']; ?>">
-                            </td>
-                        </tr>
-                    </table>
+
+                    <div class="form-group">
+                        <label for="adm_sql_dialect"><?php echo $adm_strings['DBDialect']; ?></label>
+                        <?php echo get_selectlist('adm_sql_dialect', array(1, 3), $s_gfix['dialect'], TRUE); ?>
+                    </div>
+                    <input type="submit" class="btn btn-default" name="adm_gfix_dialect"
+                           value="<?php echo $button_strings['Set']; ?>">
                 </td>
                 <td>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th align="left" colspan="3"><?php echo $adm_strings['AccessMode']; ?></th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <?php echo get_selectlist('adm_access_mode', array($adm_strings['ReadWrite'], $adm_strings['ReadOnly']), $s_gfix['access_mode'], TRUE); ?>
-                                <input type="submit" class="btn btn-default" name="adm_gfix_access_mode" value="<?php echo $button_strings['Set']; ?>">
-                            </td>
-                        </tr>
-                    </table>
+
+                    <div class="form-group">
+                        <label for="adm_access_mode"><?php echo $adm_strings['AccessMode']; ?></label>
+                        <?php echo get_selectlist('adm_access_mode', array($adm_strings['ReadWrite'], $adm_strings['ReadOnly']), $s_gfix['access_mode'], TRUE); ?>
+                    </div>
+                    <input type="submit" class="btn btn-default" name="adm_gfix_access_mode"
+                           value="<?php echo $button_strings['Set']; ?>">
                 </td>
                 <td>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th align="left" colspan="3"><?php echo $adm_strings['WriteMode']; ?></th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <?php echo get_selectlist('adm_write_mode', array($adm_strings['Sync'], $adm_strings['Async']), $s_gfix['write_mode'], TRUE); ?>
-                                <input type="submit" class="btn btn-default" name="adm_gfix_write_mode" value="<?php echo $button_strings['Set']; ?>">
-                            </td>
-                        </tr>
-                    </table>
+
+                    <div class="form-group">
+                        <label for="adm_write_mode"><?php echo $adm_strings['WriteMode']; ?></label>
+                        <?php echo get_selectlist('adm_write_mode', array($adm_strings['Sync'], $adm_strings['Async']), $s_gfix['write_mode'], TRUE); ?>
+                    </div>
+                    <input type="submit" class="btn btn-default" name="adm_gfix_write_mode"
+                           value="<?php echo $button_strings['Set']; ?>">
                 </td>
                 <td>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th align="left" colspan="3"><?php echo $adm_strings['UseSpace']; ?></th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <?php echo get_selectlist('adm_use_space', array($adm_strings['SmallFull'], $adm_strings['Reserve']), $s_gfix['use_space'], TRUE); ?>
-                                <input type="submit" class="btn btn-default" name="adm_gfix_use_space" value="<?php echo $button_strings['Set']; ?>">
-                            </td>
-                        </tr>
-                    </table>
+
+                    <div class="form-group">
+                        <label for="adm_use_space"><?php echo $adm_strings['UseSpace']; ?></label>
+                        <?php echo get_selectlist('adm_use_space', array($adm_strings['SmallFull'], $adm_strings['Reserve']), $s_gfix['use_space'], TRUE); ?>
+                    </div>
+                    <input type="submit" class="btn btn-default" name="adm_gfix_use_space"
+                           value="<?php echo $button_strings['Set']; ?>">
                 </td>
             </tr>
         </table>
@@ -90,59 +72,62 @@
 
         <table class="table table-bordered">
             <tr>
-                <th align="left" colspan="5"><?php echo $adm_strings['Sweeping']; ?></th>
+                <th align="left" colspan="2"><?php echo $adm_strings['Sweeping']; ?></th>
             </tr>
             <tr>
-                <td><?php echo $adm_strings['SetInterv']; ?>&nbsp;
-                    <input type="text" class="form-control" size="9" maxlength="8" name="adm_housekeeping" value="<?php echo $s_gfix['sweep_interval']; ?>">
-                    <input type="submit" class="btn btn-default" name="adm_gfix_housekeeping" value="<?php echo $button_strings['Set']; ?>">
-                </td>
-                <td width="20">&nbsp;</td>
-                <td>
-                    <input type="checkbox" name="adm_sweep_ignore" value="1"<?php if ($s_gfix['sweep_ignore']) echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['IgnoreChk']; ?>
-                </td>
-                <td width="20">&nbsp;</td>
-                <td>
-                    <input type="submit" class="btn btn-default" name="adm_gfix_sweep" value="<?php echo $button_strings['SweepNow']; ?>">
+                <td width="50%">
+                    <div class="form-group">
+                        <label for="adm_housekeeping"><?php echo $adm_strings['SetInterv']; ?></label>
+                        <input type="text" class="form-control" size="9" maxlength="8" id="adm_housekeeping"
+                               name="adm_housekeeping" value="<?php echo $s_gfix['sweep_interval']; ?>">
+                    </div>
+                    <input type="submit" class="btn btn-default" name="adm_gfix_housekeeping"
+                           value="<?php echo $button_strings['Set']; ?>">
+                </td>
+                <td width="50%">
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" name="adm_sweep_ignore"
+                                   value="1"<?php if ($s_gfix['sweep_ignore']) echo ' checked'; ?>> <?php echo $adm_strings['IgnoreChk']; ?>
+                        </label>
+                    </div>
+                    <input type="submit" class="btn btn-default margin-left-10px" name="adm_gfix_sweep"
+                           value="<?php echo $button_strings['SweepNow']; ?>">
                 </td>
             </tr>
         </table>
-        <br>
 
         <table class="table table-bordered">
             <tr>
-                <th align="left" colspan="9"><?php echo $adm_strings['DataRepair']; ?></th>
+                <th align="left"><?php echo $adm_strings['DataRepair']; ?></th>
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="adm_repair" value="mend"<?php if ($s_gfix['repair'] == 'mend') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['Mend']; ?>
-                </td>
-                <td>
-                    <input type="radio" name="adm_repair" value="validate"<?php if ($s_gfix['repair'] == 'validate') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['Validate']; ?>
-                </td>
-                <td>
-                    <input type="radio" name="adm_repair" value="full"<?php if ($s_gfix['repair'] == 'full') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['Full']; ?>
-                </td>
-                <td>
-                    <input type="radio" name="adm_repair" value="no_update"<?php if ($s_gfix['repair'] == 'no_update') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['NoUpdate']; ?>
-                </td>
-                <td width="20">&nbsp;</td>
-                <td>
-                    <input type="checkbox" name="adm_repair_ignore" value="1"<?php if ($s_gfix['repair_ignore']) echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['IgnoreChk']; ?>
-                </td>
-                <td width="20">&nbsp;</td>
-                <td>
-                    <input type="submit" class="btn btn-default" name="adm_gfix_repair" value="<?php echo $button_strings['Execute']; ?>">
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_repair"
+                               value="mend"<?php if ($s_gfix['repair'] == 'mend') echo ' checked'; ?>> <?php echo $adm_strings['Mend']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_repair"
+                               value="validate"<?php if ($s_gfix['repair'] == 'validate') echo ' checked'; ?>> <?php echo $adm_strings['Validate']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_repair"
+                               value="full"<?php if ($s_gfix['repair'] == 'full') echo ' checked'; ?>> <?php echo $adm_strings['Full']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_repair"
+                               value="no_update"<?php if ($s_gfix['repair'] == 'no_update') echo ' checked'; ?>> <?php echo $adm_strings['NoUpdate']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_repair_ignore"
+                               value="1"<?php if ($s_gfix['repair_ignore']) echo ' checked'; ?>> <?php echo $adm_strings['IgnoreChk']; ?>
+                    </label>
+                    <input type="submit" class="btn btn-default margin-left-10px" name="adm_gfix_repair"
+                           value="<?php echo $button_strings['Execute']; ?>">
                 </td>
             </tr>
         </table>
-        <br>
 
         <table class="table table-bordered">
             <tr>
@@ -150,42 +135,44 @@
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="adm_shutdown" value="noconns"<?php if ($s_gfix['_shutdown'] == 'noconns') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['NoConns']; ?>
-                </td>
-                <td>
-                    <input type="radio" name="adm_shutdown" value="notrans"<?php if ($s_gfix['shutdown'] == 'notrans') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['NoTrans']; ?>
-                </td>
-                <td>
-                    <input type="radio" name="adm_shutdown" value="force"<?php if ($s_gfix['shutdown'] == 'force') echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['Force']; ?>
-                </td>
-                <td width="20">&nbsp;</td>
-                <td>
-                    <?php echo $adm_strings['ForSeconds'] . '&nbsp;' . get_textfield('adm_shut_secs', 5, 4, $s_gfix['shutdown_seconds']) ?>
-                <td width="20">&nbsp;</td>
-                <td>
-                    <input type="submit" class="btn btn-default" name="adm_gfix_shutdown" value="<?php echo $button_strings['Execute']; ?>">
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_shutdown"
+                               value="noconns"<?php if ($s_gfix['_shutdown'] == 'noconns') echo ' checked'; ?>>&nbsp;
+                        <?php echo $adm_strings['NoConns']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_shutdown"
+                               value="notrans"<?php if ($s_gfix['shutdown'] == 'notrans') echo ' checked'; ?>>&nbsp;
+                        <?php echo $adm_strings['NoTrans']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_shutdown"
+                               value="force"<?php if ($s_gfix['shutdown'] == 'force') echo ' checked'; ?>>&nbsp;
+                        <?php echo $adm_strings['Force']; ?>
+                    </label>
+                    <div class="form-group">
+                        <label for="adm_shut_secs"
+                               class="margin-left-10px"><?php echo $adm_strings['ForSeconds']; ?></label>
+                        <?php echo get_textfield('adm_shut_secs', 5, 4, $s_gfix['shutdown_seconds']) ?>
+                    </div>
+                    <input type="submit" class="btn btn-default margin-left-10px" name="adm_gfix_shutdown"
+                           value="<?php echo $button_strings['Execute']; ?>">
+                    <input type="submit" class="btn btn-default" name="adm_gfix_rescind"
+                           value="<?php echo $adm_strings['Rescind']; ?>">
                 </td>
+
             </tr>
             <tr>
-                <td colspan="5" align="right">
-                    <?php echo $adm_strings['Rescind']; ?>&nbsp;
-                </td>
-                <td width="20">&nbsp;</td>
                 <td>
-                    <input type="submit" class="btn btn-default" name="adm_gfix_rescind" value="<?php echo $button_strings['Execute']; ?>">
-                </td>
-            </tr>
-            <tr>
-                <td colspan="7">
-                    <input type="checkbox" name="adm_shut_reconnect" value="1"<?php if ($s_gfix['reconnect']) echo ' checked'; ?>>
-                    <?php echo $adm_strings['Reconnect']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_shut_reconnect"
+                               value="1"<?php if ($s_gfix['reconnect']) echo ' checked'; ?>>
+                        <?php echo $adm_strings['Reconnect']; ?>&nbsp;
+                    </label>
                 </td>
             </tr>
         </table>
     </form>
-<?php
+    <?php
 endif;
 ?>
diff --git a/panels/adm_restore.php b/panels/adm_restore.php
index ae2ca48..f678ac5 100644
--- a/panels/adm_restore.php
+++ b/panels/adm_restore.php
@@ -9,42 +9,52 @@
 if ($s_connected == TRUE):
 
     ?>
-    <form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="adm_restore">
+    <form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>" name="adm_restore"
+          class="form-inline">
         <table class="table table-bordered">
             <tr>
-                <th colspan="2" align="left"><?php echo $adm_strings['RSource']; ?></th>
+                <th align="left">
+                    <?php echo $adm_strings['RSource']; ?>
+                </th>
             </tr>
             <tr>
                 <td>
-                    <?php echo $adm_strings['FDName']; ?>
-                </td>
-                <td>
-                    <?php if (defined('BACKUP_DIR') && BACKUP_DIR !== '') echo BACKUP_DIR . '<br>'; ?>
-                    <?php echo get_textfield('adm_re_source', 50, 256, $s_restore['source']); ?>
+                    <div class="form-group">
+                        <label for="adm_re_source"><?php echo $adm_strings['FDName']; ?></label>
+
+                        <div class="input-group">
+                            <?php if (defined('BACKUP_DIR') && BACKUP_DIR !== '') echo '<div class="input-group-addon">' . BACKUP_DIR . '</div>'; ?>
+                            <?php echo get_textfield('adm_re_source', 50, 256, $s_restore['source']); ?>
+                        </div>
+                    </div>
                 </td>
             </tr>
         </table>
 
         <table class="table table-bordered">
             <tr>
-                <th colspan="2" align="left"><?php echo $adm_strings['RTarget']; ?></th>
+                <th align="left"><?php echo $adm_strings['RTarget']; ?></th>
             </tr>
             <tr>
                 <td>
-                    <?php echo $adm_strings['TargetDB']; ?>
-                </td>
-                <td>
-                    <?php echo get_textfield('adm_re_target', 50, 256, $s_restore['target']); ?>
+                    <div class="form-group">
+                        <label for="adm_re_target"><?php echo $adm_strings['TargetDB']; ?></label>
+                        <?php echo get_textfield('adm_re_target', 50, 256, $s_restore['target']); ?>
+                    </div>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="adm_re_overwrite" value="0"<?php if ($s_restore['overwrite'] == FALSE) echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['NewFile']; ?>
-                </td>
-                <td>
-                    <input type="radio" name="adm_re_overwrite" value="1"<?php if ($s_restore['overwrite'] == TRUE) echo ' checked'; ?>>&nbsp;
-                    <?php echo $adm_strings['RestFile']; ?>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_re_overwrite"
+                               value="0"<?php if ($s_restore['overwrite'] == FALSE) echo ' checked'; ?>>&nbsp;
+                        <?php echo $adm_strings['NewFile']; ?>
+                    </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="adm_re_overwrite"
+                               value="1"<?php if ($s_restore['overwrite'] == TRUE) echo ' checked'; ?>>&nbsp;
+                        <?php echo $adm_strings['RestFile']; ?>
+                    </label>
                 </td>
             </tr>
         </table>
@@ -55,37 +65,57 @@
             </tr>
             <tr>
                 <td>
-                    <input type="checkbox" name="adm_re_inactive" value="1"<?php if ($s_restore['inactive'] == TRUE) echo ' checked'; ?>>
-                    <?php echo $adm_strings['IdxInact']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_re_inactive"
+                               value="1"<?php if ($s_restore['inactive'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['IdxInact']; ?>
+                    </label>
                 </td>
                 <td>
-                    <input type="checkbox" name="adm_re_novalidity" value="1"<?php if ($s_restore['novalidity'] == TRUE) echo ' checked'; ?>>
-                    <?php echo $adm_strings['NoValidity']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_re_novalidity"
+                               value="1"<?php if ($s_restore['novalidity'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['NoValidity']; ?>
+                    </label>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <input type="checkbox" name="adm_re_oneattime" value="1"<?php if ($s_restore['oneattime'] == TRUE) echo ' checked'; ?>>
-                    <?php echo $adm_strings['OneAtTime']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_re_oneattime"
+                               value="1"<?php if ($s_restore['oneattime'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['OneAtTime']; ?>
+                    </label>
                 </td>
                 <td>
-                    <input type="checkbox" name="adm_re_kill" value="1"<?php if ($s_restore['kill'] == TRUE) echo ' checked'; ?>>
-                    <?php echo $adm_strings['KillShad']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_re_kill"
+                               value="1"<?php if ($s_restore['kill'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['KillShad']; ?>
+                    </label>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <input type="checkbox" name="adm_re_useall" value="1"<?php if ($s_restore['useall'] == TRUE) echo ' checked'; ?>>
-                    <?php echo $adm_strings['UseAll']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_re_useall"
+                               value="1"<?php if ($s_restore['useall'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['UseAll']; ?>
+                    </label>
                 </td>
                 <td>
-                    <input type="checkbox" name="adm_re_verbose" value="1"<?php if ($s_restore['verbose'] == TRUE) echo ' checked'; ?>>
-                    <?php echo $adm_strings['Verbose']; ?>&nbsp;
+                    <label class="radio-inline">
+                        <input type="checkbox" name="adm_re_verbose"
+                               value="1"<?php if ($s_restore['verbose'] == TRUE) echo ' checked'; ?>>
+                        <?php echo $adm_strings['Verbose']; ?>
+                    </label>
                 </td>
             </tr>
         </table>
-        <input type="checkbox" name="adm_re_connect" value="1"<?php if ($s_restore['connect'] == TRUE) echo ' checked'; ?>>
-        <?php echo $adm_strings['ConnAfter']; ?><br>
+        <label class="radio-inline">
+            <input type="checkbox" name="adm_re_connect"
+                   value="1"<?php if ($s_restore['connect'] == TRUE) echo ' checked'; ?>>
+            <?php echo $adm_strings['ConnAfter']; ?></label>
         <?php
 
         if (isset($iframekey_restore)):
@@ -93,16 +123,20 @@
 
             <br/>
             <div class="if">
-                <iframe src="<?php echo url_session('./iframe_content.php?key=' . $iframekey_restore); ?>" width="98%" height="<?php echo $s_cust['iframeheight']; ?>" name="adm_restore_iframe"></iframe>
+                <iframe src="<?php echo url_session('./iframe_content.php?key=' . $iframekey_restore); ?>" width="98%"
+                        height="<?php echo $s_cust['iframeheight']; ?>" name="adm_restore_iframe"></iframe>
             </div>
             <br/>
-        <?php
+            <?php
 
         endif;
         ?>
-        <input type="submit" class="btn btn-default" name="adm_restore_doit" value="<?php echo $button_strings['Restore']; ?>">
+        <br/>
+        <br/>
+        <input type="submit" class="btn btn-default" name="adm_restore_doit"
+               value="<?php echo $button_strings['Restore']; ?>">
     </form>
-<?php
+    <?php
 
 endif;
 
diff --git a/views/footer.php b/views/footer.php
index 4122fe2..368948a 100644
--- a/views/footer.php
+++ b/views/footer.php
@@ -1,11 +1,3 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: gilcierweb
- * Date: 14/05/15
- * Time: 08:26
- */
-?>
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 <p>&nbsp;</p>
diff --git a/views/menu.php b/views/menu.php
index 7c4cdcb..54807a5 100644
--- a/views/menu.php
+++ b/views/menu.php
@@ -11,7 +11,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">FirebirdWebAdmin 3.0</a>
+            <a class="navbar-brand" href="#">FirebirdWebAdmin</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <?= get_tabmenu_top_fixed($s_page) ?>