diff --git a/app/css/custom.php b/app/css/custom.php
index 6726a0a8..273a9629 100644
--- a/app/css/custom.php
+++ b/app/css/custom.php
@@ -124,6 +124,11 @@ i.fa.fa-bars:hover{
   color: #858796;
 }
 
+.info-value {
+  font-size: 0.7rem;
+  margin-left: 0.7rem;
+}
+
 .info-item-xs {
   font-size: 0.7rem;
   margin-left: 0.3rem;
diff --git a/app/css/hackernews.css b/app/css/hackernews.css
index 37c12272..6d065e80 100644
--- a/app/css/hackernews.css
+++ b/app/css/hackernews.css
@@ -152,6 +152,11 @@ ul.nav-tabs, .nav-tabs .nav-link {
   color: #858796;
 }
 
+.info-value {
+  font-size: 0.7rem;
+  margin-left: 0.7rem;
+}
+
 .info-item-xs {
   font-size: 0.7rem;
   margin-left: 0.3rem;
diff --git a/app/css/lightsout.css b/app/css/lightsout.css
index 7f38035a..2fd1d5b0 100644
--- a/app/css/lightsout.css
+++ b/app/css/lightsout.css
@@ -255,6 +255,11 @@ hr {
   color: #858796;
 }
 
+.info-value {
+  font-size: 0.7rem;
+  margin-left: 0.7rem;
+}
+
 .info-item-xs {
   font-size: 0.7rem;
   line-height: 1.5em;
diff --git a/templates/dashboard.php b/templates/dashboard.php
index 47443ee8..597dc6b5 100755
--- a/templates/dashboard.php
+++ b/templates/dashboard.php
@@ -34,17 +34,31 @@
             <div class="card h-100">
               <div class="card-body wireless">
                 <h4 class="card-title"><?php echo _("Wireless Client"); ?></h4>
-                <div class="row justify-content-md-center">
-                  <div class="col-md">
-                    <div class="info-item"><?php echo _("Connected To"); ?></div><p><?php echo htmlspecialchars($connectedSSID, ENT_QUOTES); ?></p>
-                    <div class="info-item"><?php echo _("Interface"); ?></div><p><?php echo htmlspecialchars($clientInterface); ?></p>
-                    <div class="info-item"><?php echo _("AP Mac Address"); ?></div><p><?php echo htmlspecialchars($connectedBSSID, ENT_QUOTES); ?></p>
-                    <div class="info-item"><?php echo _("Bitrate"); ?></div><p><?php echo htmlspecialchars($bitrate, ENT_QUOTES); ?></p>
-                    <div class="info-item"><?php echo _("Signal Level"); ?></div><p><?php echo htmlspecialchars($signalLevel, ENT_QUOTES); ?></p>
-                    <div class="info-item"><?php echo _("Transmit Power"); ?></div><p><?php echo htmlspecialchars($txPower, ENT_QUOTES); ?></p>
-                    <div class="info-item"><?php echo _("Frequency"); ?></div><p><?php echo htmlspecialchars($frequency, ENT_QUOTES); ?></p>
+                <div class="row ml-1">
+                  <div class="col-sm">
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("Connected To"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($connectedSSID, ENT_QUOTES); ?></div>
+                    </div>
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("Interface"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($clientInterface); ?></div>
+                    </div>
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("AP Mac Address"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($connectedBSSID, ENT_QUOTES); ?></div>
+                    </div>
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("Bitrate"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($bitrate, ENT_QUOTES); ?></div>
+                    </div>
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("Signal Level"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($signalLevel, ENT_QUOTES); ?></div>
+                    </div>
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("Transmit Power"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($txPower, ENT_QUOTES); ?></div>
+                    </div>
+                    <div class="row mb-1">
+                      <div class="info-item col-xs-3"><?php echo _("Frequency"); ?></div><div class="info-value col-xs-3"><?php echo htmlspecialchars($frequency, ENT_QUOTES); ?></div>
+                    </div>
                   </div>
-                  <div class="col-md mt-2 d-flex justify-content-center">
+                  <div class="col-md d-flex">
                     <script>var linkQ = <?php echo json_encode($strLinkQuality); ?>;</script>
                     <div class="chart-container">
                       <canvas id="divChartLinkQ"></canvas>
diff --git a/templates/openvpn.php b/templates/openvpn.php
index df97ce32..33f61a81 100755
--- a/templates/openvpn.php
+++ b/templates/openvpn.php
@@ -29,13 +29,15 @@
                 <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
                 <div class="row">
                   <div class="col">
-                    <div class="row">
+                    <div class="row mb-2">
                       <div class="col-lg-12 mt-2 mb-2">
-                        <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
-                        <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
+                        <div class="row ml-1">
+                          <div class="info-item col-xs-3"><?php echo _("IPv4 Address"); ?></div>
+                          <div class="info-value col-xs-3"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
+                        </div>
                       </div>
                     </div>
-                    <div class="row">
+                      <div class="row">
                      <div class="form-group col-lg-12">
                       <label for="code"><?php echo _("Username"); ?></label>
                         <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />