diff --git a/templates/about.php b/templates/about.php
index b8232a81..58a1235f 100755
--- a/templates/about.php
+++ b/templates/about.php
@@ -1,9 +1,8 @@
 <div class="row">
-  <div class="col-xl-12">
+  <div class="col-lg-12">
     <div class="card">
-      <div class="card card-header"><i class="fas fa-info-circle"></i> <?php echo _("About RaspAP"); ?></div>
+      <div class="card-header"><i class="fas fa-info-circle mr-2"></i><?php echo _("About RaspAP"); ?></div>
       <div class="card-body text-center">
-
         <h3><?php echo _("RaspAP") . " v" . RASPI_VERSION; ?></h3>
         <h5><a href="https://github.com/billz/raspap-webgui/blob/master/LICENSE">GNU General Public License v3.0</a></h5>
         <p><img src="app/img/authors-8bit-200px.png"></p>
diff --git a/templates/configure_client.php b/templates/configure_client.php
index 0af2cf6c..a614f7be 100755
--- a/templates/configure_client.php
+++ b/templates/configure_client.php
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-wifi"></i> <?php echo _("Configure WiFi client"); ?></div>
+      <div class="card-header"><i class="fas fa-wifi mr-2"></i><?php echo _("Configure WiFi client"); ?></div>
       <!-- /.card-heading -->
       <div class="card-body">
         <?php $status->showMessages(); ?>
diff --git a/templates/data_usage.php b/templates/data_usage.php
index 0d0c399a..332941fd 100755
--- a/templates/data_usage.php
+++ b/templates/data_usage.php
@@ -1,20 +1,18 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-chart-bar"></i> <?php echo _("Data usage monitoring"); ?></div>
+      <div class="card-header"><i class="fas fa-chart-bar mr-2"></i><?php echo _("Data usage monitoring"); ?></div>
         <div class="card-body">
-
           <ul id="tabbarBandwidth" class="nav nav-tabs" role="tablist">
-            <li class="nav-item active"><a class="nav-link" href="#hourly" aria-controls="hourly" role="tab" data-toggle="tab"><?php echo _("Hourly"); ?></a></li>
+            <li class="nav-item"><a class="nav-link active" href="#hourly" aria-controls="hourly" role="tab" data-toggle="tab"><?php echo _("Hourly"); ?></a></li>
             <li class="nav-item"><a class="nav-link" href="#daily" aria-controls="daily" role="tab" data-toggle="tab"><?php echo _("Daily"); ?></a></li>
             <li class="nav-item"><a class="nav-link" href="#monthly" aria-controls="monthly" role="tab" data-toggle="tab"><?php echo _("Monthly"); ?></a></li>
           </ul>
-
           <div id="tabsBandwidth" class="tabcontenttraffic tab-content">
             <div role="tabpanel" class="tab-pane active" id="hourly">
               <div class="row">
                 <div class="col-lg-12">
-                  <h4><?php echo _('Hourly traffic amount'); ?></h4>
+                  <h4 class="mt-3"><?php echo _('Hourly traffic amount'); ?></h4>
                   <label for="cbxInterfacehourly"><?php echo _('interface'); ?></label>
                   <select id="cbxInterfacehourly" class="form-control" name="interfacehourly">
                     <?php foreach ($interfaces as $if) : ?>
@@ -33,7 +31,7 @@
             <div role="tabpanel" class="tab-pane fade" id="daily">
               <div class="row">
                 <div class="col-lg-12">
-                  <h4><?php echo _('Daily traffic amount'); ?></h4>
+                  <h4 class="mt-3"><?php echo _('Daily traffic amount'); ?></h4>
                   <label for="cbxInterfacedaily"><?php echo _('interface'); ?></label>
                   <select id="cbxInterfacedaily" class="form-control" name="interfacedaily">
                     <?php foreach ($interfaces as $if) : ?>
@@ -52,7 +50,7 @@
             <div role="tabpanel" class="tab-pane fade" id="monthly">
               <div class="row">
                 <div class="col-lg-12">
-                  <h4><?php echo _("Monthly traffic amount"); ?></h4>
+                  <h4 class="mt-3"><?php echo _("Monthly traffic amount"); ?></h4>
                   <label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label>
                   <select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly">
                     <?php foreach ($interfaces as $if) : ?>
diff --git a/templates/networking.php b/templates/networking.php
index 62f9513d..528c22fd 100755
--- a/templates/networking.php
+++ b/templates/networking.php
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12">
    <div class="card">
-    <div class="card-header"><i class="fas fa-sitemap"></i> <?php echo _("Configure networking"); ?></div>
+    <div class="card-header"><i class="fas fa-sitemap mr-2"></i><?php echo _("Configure networking"); ?></div>
       <div class="card-body">
         <div id="msgNetworking"></div>
         <ul class="nav nav-tabs">