diff --git a/application/views/general/error404.php b/application/views/general/error404.php
index 07e8fa58..e1895a63 100644
--- a/application/views/general/error404.php
+++ b/application/views/general/error404.php
@@ -21,6 +21,7 @@
 
     <script src="<?= asset_url('assets/ext/jquery/jquery.min.js') ?>"></script>
     <script src="<?= asset_url('assets/ext/bootstrap/js/bootstrap.bundle.min.js') ?>"></script>
+    <script src="<?= asset_url('assets/ext/fontawesome/js/all.min.js') ?>"></script>
     <script src="<?= asset_url('assets/ext/datejs/date.min.js') ?>"></script>
     <script src="<?= asset_url('assets/js/polyfill.js') ?>"></script>
     <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
@@ -33,9 +34,7 @@
             <?= lang('page_not_found_message') ?>
         </p>
 
-        <br>
-
-        <a href="<?= site_url() ?>" class="btn btn-primary btn-large">
+        <a href="<?= site_url() ?>" class="btn btn-success btn-large">
             <i class="far fa-calendar-alt mr-2"></i>
             <?= lang('book_appointment_title') ?>
         </a>
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index ccce2cd0..b8f31947 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -66,6 +66,7 @@
             </small>
         </div>
     </div>
+    <script src="<?= asset_url('assets/ext/fontawesome/js/all.min.js') ?>"></script>
     <script src="<?= asset_url('assets/js/polyfill.js') ?>"></script>
     <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
     <script src="<?= asset_url('assets/js/forgot_password.js') ?>"></script>
diff --git a/application/views/user/login.php b/application/views/user/login.php
index 599148e6..4cffdddc 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -57,15 +57,13 @@
                 		placeholder="<?= lang('enter_password_here') ?>"
                 		class="form-control" />
             </div>
-            <br>
 
-            <button type="submit" id="login" class="btn btn-primary">
-                <i class="fas fa-sign-in-alt mr-2"></i>
-                <?= lang('login') ?>
-            </button>
-
-            <br>
-            <br>
+            <div class="form-group">
+                <button type="submit" id="login" class="btn btn-primary">
+                    <i class="fas fa-sign-in-alt mr-2"></i>
+                    <?= lang('login') ?>
+                </button>
+            </div>
 
             <a href="<?= site_url('user/forgot_password') ?>" class="forgot-password">
             	<?= lang('forgot_your_password') ?></a>
@@ -83,6 +81,7 @@
         </form>
     </div>
 
+    <script src="<?= asset_url('assets/ext/fontawesome/js/all.min.js') ?>"></script>
     <script src="<?= asset_url('assets/js/polyfill.js') ?>"></script>
     <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
     <script src="<?= asset_url('assets/js/login.js') ?>"></script>
diff --git a/application/views/user/logout.php b/application/views/user/logout.php
index 0cb88a41..d7ecc117 100644
--- a/application/views/user/logout.php
+++ b/application/views/user/logout.php
@@ -19,7 +19,7 @@
         var EALang = <?= json_encode($this->lang->language) ?>;
 	</script>
 
-	<script src="<?= asset_url('assets/ext/jquery/jquery.min.js') ?>"></script>
+    <script src="<?= asset_url('assets/ext/jquery/jquery.min.js') ?>"></script>
 	<script src="<?= asset_url('assets/ext/bootstrap/js/bootstrap.bundle.min.js') ?>"></script>
 	<script src="<?= asset_url('assets/ext/fontawesome/js/all.min.js') ?>"></script>
 </head>