diff --git a/app/css/all.css b/app/css/all.css
index d9de52e3..15700850 100644
--- a/app/css/all.css
+++ b/app/css/all.css
@@ -75,8 +75,8 @@ License: GNU General Public License v3.0
 
 .service-status-down {
   color: #f80107 !important;
-  animation: flash 1s linear infinite;
 }
+
 @keyframes flash {
   50% {
     opacity: 0;
diff --git a/templates/provider.php b/templates/provider.php
index 0ca9827b..db334c86 100755
--- a/templates/provider.php
+++ b/templates/provider.php
@@ -20,7 +20,7 @@
             <div class="col">
               <button class="btn btn-light btn-icon-split btn-sm service-status float-right">
                 <span class="icon text-gray-600"><i class="fas fa-circle service-status-<?php echo $serviceStatus ?>"></i></span>
-                <span class="text service-status"><?php echo strtolower($providerName); ?> <?php echo _($serviceStatus) ?></span>
+                <span class="text service-status"><?php echo strtolower($providerName); ?> <?php echo _($statusDisplay) ?></span>
               </button>
             </div>
           </div><!-- /.row -->
@@ -31,7 +31,7 @@
             <?php echo CSRFTokenFieldTag() ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-                <li class="nav-item"><a class="nav-link active" id="clienttab" href="#providerclient" data-toggle="tab"><?php echo _("Provider settings"); ?></a></li>
+                <li class="nav-item"><a class="nav-link active" id="clienttab" href="#providerclient" data-toggle="tab"><?php echo _("Settings"); ?></a></li>
                 <li class="nav-item"><a class="nav-link" id="loggingtab" href="#providerstatus" data-toggle="tab"><?php echo _("Status"); ?></a></li>
             </ul>
 
diff --git a/templates/provider/general.php b/templates/provider/general.php
index 7c6cd209..ec55765f 100644
--- a/templates/provider/general.php
+++ b/templates/provider/general.php
@@ -1,5 +1,5 @@
 <div class="tab-pane active" id="providerclient">
-  <h4 class="mt-3"><?php echo _("VPN provider settings") ;?></h4>
+  <h4 class="mt-3"><?php echo sprintf(_("%s settings"), $providerName) ;?></h4>
   <div class="row">
     <div class="col-lg-8">
       <div class="row mb-2">
@@ -9,7 +9,7 @@
                <i class="fas fa-globe mr-1"></i><?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>
+               <?php echo htmlspecialchars($publicIP, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($publicIP); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a>
              </div>
            </div>
          </div>