diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php
index 680e441a..d47ea941 100644
--- a/application/views/timeplotter/index.php
+++ b/application/views/timeplotter/index.php
@@ -8,8 +8,8 @@
                 <div class="col-md-3">
                     <select id="band" name="band" class="form-select">
                         <option value="All">All</option>
-                        <?php foreach($worked_bands as $band) {
-                            echo '<option value="' . $band . '">' . $band . '</option>'."\n";
+                        <?php foreach ($worked_bands as $band) {
+                            echo '<option value="' . $band . '">' . $band . '</option>' . "\n";
                         } ?>
                     </select>
                 </div>
@@ -17,16 +17,16 @@
                 <label class="col-md-1 control-label" for="dxcc">DXCC</label>
                 <div class="col-md-3">
                     <select id="dxcc" name="dxcc" class="form-select">
-                        <option value = 'All'>All</option>
+                        <option value='All'>All</option>
                         <?php
                         if ($dxcc_list->num_rows() > 0) {
-                                foreach ($dxcc_list->result() as $dxcc) {
-                                    echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
-                                    if ($dxcc->end != null) {
-                                        echo ' ('.lang('gen_hamradio_deleted_dxcc').')';
-                                    }
-                                    echo '</option>';
+                            foreach ($dxcc_list->result() as $dxcc) {
+                                echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
+                                if ($dxcc->end != null) {
+                                    echo ' (' . lang('gen_hamradio_deleted_dxcc') . ')';
                                 }
+                                echo '</option>';
+                            }
                         }
                         ?>
                     </select>
@@ -37,10 +37,10 @@
                 <label class="col-md-1 control-label" for="cqzone">CQ Zone</label>
                 <div class="col-md-3">
                     <select id="cqzone" name="cqzone" class="form-select">
-                        <option value = 'All'>All</option>
+                        <option value='All'>All</option>
                         <?php
-                        for ($i = 1; $i<=40; $i++) {
-                            echo '<option value='. $i . '>'. $i .'</option>';
+                        for ($i = 1; $i <= 40; $i++) {
+                            echo '<option value=' . $i . '>' . $i . '</option>';
                         }
                         ?>
                     </select>
@@ -57,4 +57,4 @@
 
         <div id="timeplotter_div">
         </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/update/index.php b/application/views/update/index.php
index e2e75c82..cf05c2ab 100644
--- a/application/views/update/index.php
+++ b/application/views/update/index.php
@@ -3,7 +3,7 @@
 
 	<div class="card">
 		<div class="card-header">
-			<ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right"  id="myTab" role="tablist">
+			<ul style="font-size: 15px;" class="nav nav-tabs card-header-tabs pull-right" id="myTab" role="tablist">
 				<li class="nav-item">
 					<a class="nav-link active" id="dxcc-tab" data-bs-toggle="tab" href="#dxcc" role="tab" aria-controls="update" aria-selected="true">DXCC Lookup Data</a>
 				</li>
@@ -19,9 +19,9 @@
 					<p class="card-text">Here you can update the DXCC lookup data that is used for displaying callsign information.</p>
 					<p class="card-text">This data is provided by <a href="https://clublog.org/">Clublog</a>.</p>
 
-					<?php if(!extension_loaded('xml')) { ?>
+					<?php if (!extension_loaded('xml')) { ?>
 						<div class="alert alert-danger" role="alert">
-						You must install php-xml for this to work.
+							You must install php-xml for this to work.
 						</div>
 					<?php } else { ?>
 						<h5>Check for DXCC Data Updates</h5>
@@ -29,37 +29,35 @@
 
 						<div id="dxcc_update_status">Status:</br></div>
 
-						<br/>
-						<br/>
+						<br />
+						<br />
 						<h5>Apply DXCC Data to Logbook</h5>
 						<p class="card-text">
 							After updating, Cloudlog can fill in missing callsign information in the logbook using the newly-obtained DXCC data.
 							You can choose to check just the QSOs in the logbook that are missing DXCC metadata or to re-check the entire logbook
 							and update existing metadata as well, in case it has changed.
 						</p>
-						<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc');?>">Check QSOs missing DXCC data</a></p>
-						<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc/all');?>">Re-check all QSOs in logbook</a></p>
+						<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc'); ?>">Check QSOs missing DXCC data</a></p>
+						<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc/all'); ?>">Re-check all QSOs in logbook</a></p>
 
 						<h5>Apply Continent Data to Logbook</h5>
 						<p class="card-text">
 							This function can be used to update QSO continent information for all QSOs in Cloudlog missing that information.
 						</p>
-						<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_continent');?>">Check QSOs missing continent data</a></p>
+						<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_continent'); ?>">Check QSOs missing continent data</a></p>
 						<style>
-							#dxcc_update_status{
-							display: None;
+							#dxcc_update_status {
+								display: None;
 							}
 						</style>
 					<?php } ?>
 				</div>
 				<div class="tab-pane fade" id="distance" role="tabpanel" aria-labelledby="distance-tab">
 					<p class="card-text">Here you can update QSOs with missing distance information.</p>
-					<p><a class="btn btn-primary" hx-get="<?php echo site_url('update/update_distances');?>"  hx-target="#distance_results" href="<?php echo site_url('update/update_distances');?>">Update distance data</a></p>
+					<p><a class="btn btn-primary" hx-get="<?php echo site_url('update/update_distances'); ?>" hx-target="#distance_results" href="<?php echo site_url('update/update_distances'); ?>">Update distance data</a></p>
 					<div id="distance_results"></div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-
-
+</div>
\ No newline at end of file
diff --git a/application/views/user/delete.php b/application/views/user/delete.php
index 91587efe..a35c462e 100644
--- a/application/views/user/delete.php
+++ b/application/views/user/delete.php
@@ -1,18 +1,18 @@
 <div class="container">
-<br>
+	<br>
 	<div class="card">
-	  <div class="card-header">
-	    <?php echo lang('account_delete_user_account'); ?> <?php echo $user_name; ?>
-	  </div>
-	  <div class="card-body">
-	    <h5 class="card-title"></h5>
+		<div class="card-header">
+			<?php echo lang('account_delete_user_account'); ?> <?php echo $user_name; ?>
+		</div>
+		<div class="card-body">
+			<h5 class="card-title"></h5>
 
-	    <p class="card-text"><?php echo lang('account_are_you_sure_you_want_to_delete_the_user_account'); ?> <b><?php echo $user_name; ?></b>?</p>
+			<p class="card-text"><?php echo lang('account_are_you_sure_you_want_to_delete_the_user_account'); ?> <b><?php echo $user_name; ?></b>?</p>
 
-	    <form method="post" action="<?php echo site_url('user/delete')."/".$this->uri->segment(3); ?>" name="users">
-	    <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
-			<input class="btn btn-danger" type="submit" value="<?php echo lang('account_yes_delete_this_user'); ?>" /> <a href="<?php echo site_url('user'); ?>" class="btn btn-success"><?php echo lang('account_no_do_not_delete_this_user'); ?></a>
+			<form method="post" action="<?php echo site_url('user/delete') . "/" . $this->uri->segment(3); ?>" name="users">
+				<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
+				<input class="btn btn-danger" type="submit" value="<?php echo lang('account_yes_delete_this_user'); ?>" /> <a href="<?php echo site_url('user'); ?>" class="btn btn-success"><?php echo lang('account_no_do_not_delete_this_user'); ?></a>
 			</form>
-	  </div>
+		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index d1c1e5e6..5d5f032d 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -55,8 +55,8 @@
 											<div class="input-group">
 												<span class="input-group-text"><i class="fa fa-user"></i></span>
 												<input class="form-control" type="text" name="user_name" value="<?php if (isset($user_name)) {
-																												echo $user_name;
-																											} ?>" />
+																													echo $user_name;
+																												} ?>" />
 											</div>
 											<?php if (isset($username_error)) {
 												echo "<small class=\"text-danger\"><i class=\"fa fa-exclamation-circle\"></i> " . $username_error . "</small>";
@@ -68,8 +68,8 @@
 											<div class="input-group">
 												<span class="input-group-text"><i class="fa fa-envelope"></i></span>
 												<input class="form-control" type="email" name="user_email" value="<?php if (isset($user_email)) {
-																													echo $user_email;
-																												} ?>" />
+																														echo $user_email;
+																													} ?>" />
 											</div>
 											<?php if (isset($email_error)) {
 												echo "<small class=\"text-danger\"><i class=\"fa fa-exclamation-circle\"></i> " . $email_error . "</small>";
@@ -296,28 +296,38 @@
 									<div class="card-body">
 										<div class="mb-3">
 											<div class="form-check form-switch">
-												<input name="user_dashboard_enable_dxpedition_card" class="form-check-input" type="checkbox" role="switch" id="DashboardUpcomingDXpeditionCheck" <?php if ($dashboard_upcoming_dx_card) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck" >Enable Upcoming DXPedition Card</label>
+												<input name="user_dashboard_enable_dxpedition_card" class="form-check-input" type="checkbox" role="switch" id="DashboardUpcomingDXpeditionCheck" <?php if ($dashboard_upcoming_dx_card) {
+																																																		echo 'checked';
+																																																	} ?>>
+												<label class="form-check-label" for="DashboardUpcomingDXpeditionCheck">Enable Upcoming DXPedition Card</label>
 											</div>
 
 											<div class="form-check form-switch">
-												<input name="user_dashboard_enable_qslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardQSLCardCheck" <?php if ($dashboard_qslcard_card) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="DashboardQSLCardCheck" >Enable QSL Cards Card</label>
+												<input name="user_dashboard_enable_qslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardQSLCardCheck" <?php if ($dashboard_qslcard_card) {
+																																														echo 'checked';
+																																													} ?>>
+												<label class="form-check-label" for="DashboardQSLCardCheck">Enable QSL Cards Card</label>
 											</div>
 
 											<div class="form-check form-switch">
-												<input name="user_dashboard_enable_eqslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardeQSLCardCheck" <?php if ($dashboard_eqslcard_card) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="DashboardeQSLCardCheck" >Enable eQSL Cards Card</label>
+												<input name="user_dashboard_enable_eqslcards_card" class="form-check-input" type="checkbox" role="switch" id="DashboardeQSLCardCheck" <?php if ($dashboard_eqslcard_card) {
+																																															echo 'checked';
+																																														} ?>>
+												<label class="form-check-label" for="DashboardeQSLCardCheck">Enable eQSL Cards Card</label>
 											</div>
 
 											<div class="form-check form-switch">
-												<input name="user_dashboard_enable_lotw_card" class="form-check-input" type="checkbox" role="switch" id="DashboardlotwCardCheck" <?php if ($dashboard_lotw_card) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="DashboardlotwCardCheck" >Enable Logbook of the World Card</label>
+												<input name="user_dashboard_enable_lotw_card" class="form-check-input" type="checkbox" role="switch" id="DashboardlotwCardCheck" <?php if ($dashboard_lotw_card) {
+																																														echo 'checked';
+																																													} ?>>
+												<label class="form-check-label" for="DashboardlotwCardCheck">Enable Logbook of the World Card</label>
 											</div>
 
 											<div class="form-check form-switch">
-												<input name="user_dashboard_enable_vuccgrids_card" class="form-check-input" type="checkbox" role="switch" id="DashboardvuccgridsCardCheck" <?php if ($dashboard_vuccgrids_card) { echo 'checked'; } ?>>
-												<label class="form-check-label" for="DashboardvuccgridsCardCheck" >Enable VUCC-Grids Card</label>
+												<input name="user_dashboard_enable_vuccgrids_card" class="form-check-input" type="checkbox" role="switch" id="DashboardvuccgridsCardCheck" <?php if ($dashboard_vuccgrids_card) {
+																																																echo 'checked';
+																																															} ?>>
+												<label class="form-check-label" for="DashboardvuccgridsCardCheck">Enable VUCC-Grids Card</label>
 											</div>
 										</div>
 									</div>
@@ -440,7 +450,7 @@
 																			} ?>><?php echo lang('general_word_name'); ?></option>
 													<option value="Flag" <?php if ($user_column2 == "Flag") {
 																				echo " selected =\"selected\"";
-																			} ?>><?php echo lang('general_word_flag'); ?></option>																			
+																			} ?>><?php echo lang('general_word_flag'); ?></option>
 												</select>
 											</div>
 
@@ -1036,8 +1046,8 @@
 											<div class="mb-3">
 												<label>Callbook Username</label>
 												<input class="form-control" type="text" name="user_callbook_username" value="<?php if (isset($user_callbook_username)) {
-													echo $user_callbook_username;
-												} ?>" />
+																																	echo $user_callbook_username;
+																																} ?>" />
 												<?php if (isset($callbook_username_error)) {
 													echo "<small class=\"error\">" . $callbook_username_error . "</small>";
 												} ?>
@@ -1177,28 +1187,34 @@
 
 								<!-- Winkeyer -->
 								<div class="col-md">
-									<div class="card">										<div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div>
-										<div class="card-body">											<div class="mb-3">
+									<div class="card">
+										<div class="card-header"><?php echo lang('account_winkeyer'); ?> <span class="badge text-bg-danger float-end"><?php echo lang('admin_experimental'); ?></span></div>
+										<div class="card-body">
+											<div class="mb-3">
 												<div class="form-check form-switch">
 													<?php if (!isset($user_winkey)) {
 														$user_winkey = '0';
 													} ?>
-													<input name="user_winkey" class="form-check-input" type="checkbox" role="switch" id="user_winkeyer" value="1" <?php if ($user_winkey == 1) { echo 'checked'; } ?>>
+													<input name="user_winkey" class="form-check-input" type="checkbox" role="switch" id="user_winkeyer" value="1" <?php if ($user_winkey == 1) {
+																																										echo 'checked';
+																																									} ?>>
 													<label class="form-check-label" for="user_winkeyer"><?php echo lang('account_winkeyer_enabled'); ?></label>
 												</div>
 											</div>
 
 											<hr />
-													<div class="mb-3">
+											<div class="mb-3">
 												<div class="form-check form-switch">
 													<?php if (!isset($user_winkey_websocket)) {
 														$user_winkey_websocket = '0';
 													} ?>
-													<input name="user_winkey_websocket" class="form-check-input" type="checkbox" role="switch" id="user_winkey_websocket" value="1" <?php if (isset($user_winkey_websocket) && $user_winkey_websocket == 1) { echo 'checked'; } ?>>
+													<input name="user_winkey_websocket" class="form-check-input" type="checkbox" role="switch" id="user_winkey_websocket" value="1" <?php if (isset($user_winkey_websocket) && $user_winkey_websocket == 1) {
+																																														echo 'checked';
+																																													} ?>>
 													<label class="form-check-label" for="user_winkey_websocket">Winkey Web Sockets</label>
 												</div>
 											</div>
-											
+
 											<small class="form-text text-muted d-block mt-3"><?php echo lang('account_winkeyer_hint'); ?></small>
 										</div>
 									</div>
diff --git a/application/views/user/forgot_password.php b/application/views/user/forgot_password.php
index 910875ac..89b756e1 100644
--- a/application/views/user/forgot_password.php
+++ b/application/views/user/forgot_password.php
@@ -1,43 +1,43 @@
 <style>
-html,
-body {
-    height: 100%;
-}
+    html,
+    body {
+        height: 100%;
+    }
 
-body {
-    display: flex;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
+    body {
+        display: flex;
+        align-items: center;
+        padding-top: 40px;
+        padding-bottom: 40px;
+    }
 
-.form-forgot {
-    width: 100%;
-    max-width: 430px;
-    padding: 15px;
-    margin: auto;
-}
+    .form-forgot {
+        width: 100%;
+        max-width: 430px;
+        padding: 15px;
+        margin: auto;
+    }
 
-input[type="email"] {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
+    input[type="email"] {
+        margin-bottom: -1px;
+        border-bottom-right-radius: 0;
+        border-bottom-left-radius: 0;
+    }
 </style>
 
 <main class="form-forgot">
-    <img src="<?php echo base_url()?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;">
+    <img src="<?php echo base_url() ?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;">
     <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <div class="text-center">
-                        <h3 class="text-center"><?php echo lang('account_forgot_password'); ?> <i class="fa fa-lock"></i></h3>
-                        <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
+                <h3 class="text-center"><?php echo lang('account_forgot_password'); ?> <i class="fa fa-lock"></i></h3>
+                <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
                 <div class="panel-body">
 
-                    <?php if(validation_errors() != ''): ?>
-                    <div class="alert alert-danger" role="alert">
-                        <?php echo validation_errors(); ?>
-                    </div>
+                    <?php if (validation_errors() != ''): ?>
+                        <div class="alert alert-danger" role="alert">
+                            <?php echo validation_errors(); ?>
+                        </div>
                     <?php endif; ?>
 
                     <form id="register-form" role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/forgot_password'); ?>">
diff --git a/application/views/user/login.php b/application/views/user/login.php
index bdb90842..8396487a 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -1,44 +1,44 @@
 <style>
-html,
-body {
-    height: 100%;
-}
+    html,
+    body {
+        height: 100%;
+    }
 
-body {
-    display: flex;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
+    body {
+        display: flex;
+        align-items: center;
+        padding-top: 40px;
+        padding-bottom: 40px;
+    }
 
-.form-signin {
-    width: 100%;
-    max-width: 430px;
-    padding: 15px;
-    margin: auto;
-}
+    .form-signin {
+        width: 100%;
+        max-width: 430px;
+        padding: 15px;
+        margin: auto;
+    }
 
-.form-signin input[type="email"] {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
+    .form-signin input[type="email"] {
+        margin-bottom: -1px;
+        border-bottom-right-radius: 0;
+        border-bottom-left-radius: 0;
+    }
 
-.form-signin input[type="password"] {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
+    .form-signin input[type="password"] {
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+    }
 </style>
 <main class="form-signin">
-    <img src="<?php echo base_url()?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;">
+    <img src="<?php echo base_url() ?>/CloudLog_logo.png" class="mx-auto d-block" alt="" style="width:100px;height:100px;">
     <div class="my-2 bg-body rounded-0 shadow-sm card mb-2 shadow-sm">
         <div class="card-body">
             <h3><?php echo lang('account_login_to_cloudlog'); ?></h3>
-            
+
             <?php $this->load->view('layout/messages'); ?>
-            
+
             <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
-			<?php $this->form_validation->set_error_delimiters('', ''); ?>
+                <?php $this->form_validation->set_error_delimiters('', ''); ?>
                 <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
                 <div>
                     <label for="floatingInput"><strong><?php echo lang('account_username'); ?></strong></label>
@@ -57,10 +57,10 @@ body {
                         <input type="checkbox" name="remember_me" value="1"> <?php echo lang('account_remember_me'); ?>
                     </label>
 
-                <div>
-                    <p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
-                </div>
-                <button class="w-100 btn btn-info" type="submit"><?php echo lang('account_login'); ?> →</button>
+                    <div>
+                        <p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
+                    </div>
+                    <button class="w-100 btn btn-info" type="submit"><?php echo lang('account_login'); ?> →</button>
             </form>
         </div>
     </div>
diff --git a/application/views/user/main.php b/application/views/user/main.php
index a8ff0851..18b8ff9a 100644
--- a/application/views/user/main.php
+++ b/application/views/user/main.php
@@ -65,12 +65,12 @@
 							<td><?php echo $row->user_email; ?></td>
 							<td><?php $l = $this->config->item('auth_level');
 								echo $l[$row->user_type]; ?></td>
-							<td><?php 
+							<td><?php
 								if ($row->last_login_date != null) { // if the user never logged in before the value is null. We can show "never" then.
 									echo $row->last_login_date;
 								} else {
 									echo lang('general_word_never');
-								}?>
+								} ?>
 							</td>
 							<td style="text-align: center; vertical-align: middle;"><a href="<?php echo site_url('user/edit') . "/" . $row->user_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-user-edit"></i></a>
 							<td style="text-align: center; vertical-align: middle;">
@@ -81,7 +81,7 @@
 								?></td>
 							<td style="text-align: center; vertical-align: middle;">
 								<?php if ($_SESSION['user_id'] != $row->user_id) { ?>
-									<button class="btn btn-danger btn-sm" hx-delete="<?php echo site_url('user/delete_new/'.$row->user_id);?>"><i class="fas fa-user-minus"></i></button>	
+									<button class="btn btn-danger btn-sm" hx-delete="<?php echo site_url('user/delete_new/' . $row->user_id); ?>"><i class="fas fa-user-minus"></i></button>
 								<?php } ?>
 							</td>
 							</td>
diff --git a/application/views/user/profile.php b/application/views/user/profile.php
index 54eacf28..013f758d 100644
--- a/application/views/user/profile.php
+++ b/application/views/user/profile.php
@@ -1,55 +1,68 @@
 <div class="container">
 
-<br>
+	<br>
 
-<div class="card">
-  <div class="card-header">
-    <?php echo $this->session->userdata('user_name')."'s profile"; ?>
-  </div>
-  <div class="card-body">
-    <h5 class="card-title"></h5>
-    <p class="card-text"></p>
-    <table class="profile">
-	<tr>
-		<td width="100px">Username</td>
-		<td><?php if(isset($user_name)) { echo $user_name; } ?></td>
-	</tr>
-	
-	<tr>
-		<td>Level</td>
-		<td><?php $l = $this->config->item('auth_level'); echo $l[$user_type]; ?></td>
-	</tr>
+	<div class="card">
+		<div class="card-header">
+			<?php echo $this->session->userdata('user_name') . "'s profile"; ?>
+		</div>
+		<div class="card-body">
+			<h5 class="card-title"></h5>
+			<p class="card-text"></p>
+			<table class="profile">
+				<tr>
+					<td width="100px">Username</td>
+					<td><?php if (isset($user_name)) {
+							echo $user_name;
+						} ?></td>
+				</tr>
 
-	<tr>
-		<td>E-mail</td>
-		<td><?php if(isset($user_email)) { echo $user_email; } ?></td>
-	</tr>
-	
-	<tr>
-		<td>Callsign</td>
-		<td><?php if(isset($user_callsign)) { echo $user_callsign; } ?></td>
-	</tr>
-	
-	<tr>
-		<td>Gridsquare</td>
-		<td><?php if(isset($user_locator)) { echo $user_locator; } ?></td>
-	</tr>
-	
-	<tr>
-		<td>First name</td>
-		<td><?php if(isset($user_firstname)) { echo $user_firstname; } ?></td>
-	</tr>
-	
-	<tr>
-		<td>Last name</td>
-		<td><?php if(isset($user_lastname)) { echo $user_lastname; } ?></td>
-	</tr>
-	
-</table>	
+				<tr>
+					<td>Level</td>
+					<td><?php $l = $this->config->item('auth_level');
+						echo $l[$user_type]; ?></td>
+				</tr>
 
-<a class="btn btn-primary" href="<?php echo site_url('user/edit')."/".$this->session->userdata('user_id'); ?>">Edit profile</a>
-  </div>
-</div>
+				<tr>
+					<td>E-mail</td>
+					<td><?php if (isset($user_email)) {
+							echo $user_email;
+						} ?></td>
+				</tr>
+
+				<tr>
+					<td>Callsign</td>
+					<td><?php if (isset($user_callsign)) {
+							echo $user_callsign;
+						} ?></td>
+				</tr>
+
+				<tr>
+					<td>Gridsquare</td>
+					<td><?php if (isset($user_locator)) {
+							echo $user_locator;
+						} ?></td>
+				</tr>
+
+				<tr>
+					<td>First name</td>
+					<td><?php if (isset($user_firstname)) {
+							echo $user_firstname;
+						} ?></td>
+				</tr>
+
+				<tr>
+					<td>Last name</td>
+					<td><?php if (isset($user_lastname)) {
+							echo $user_lastname;
+						} ?></td>
+				</tr>
+
+			</table>
+
+			<a class="btn btn-primary" href="<?php echo site_url('user/edit') . "/" . $this->session->userdata('user_id'); ?>">Edit profile</a>
+		</div>
+	</div>
 
 
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/user/reset_password.php b/application/views/user/reset_password.php
index e83184c2..e3f14338 100644
--- a/application/views/user/reset_password.php
+++ b/application/views/user/reset_password.php
@@ -1,47 +1,47 @@
 <div id="container" class="container mx-auto pt-5">
-	<div class="row">
-		<div class="col-12">
-            <div class="panel panel-default">
-              <div class="panel-body">
-                <div class="text-center">
-                  <h3><i class="fa fa-lock fa-4x"></i></h3>
-                  <h2 class="text-center"><?php echo lang('account_reset_password'); ?>?</h2>
-                  <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
-                  <div class="panel-body">
-                    
-                    <?php if(validation_errors() != ''): ?>
-                    <div class="alert alert-danger" role="alert">
-                        <?php echo validation_errors(); ?>
-                    </div>
-                    <?php endif; ?>
+  <div class="row">
+    <div class="col-12">
+      <div class="panel panel-default">
+        <div class="panel-body">
+          <div class="text-center">
+            <h3><i class="fa fa-lock fa-4x"></i></h3>
+            <h2 class="text-center"><?php echo lang('account_reset_password'); ?>?</h2>
+            <p><?php echo lang('account_you_can_reset_your_password_here'); ?></p>
+            <div class="panel-body">
 
-                    <form role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/reset_password'); ?>/<?php echo $reset_code; ?>">
+              <?php if (validation_errors() != ''): ?>
+                <div class="alert alert-danger" role="alert">
+                  <?php echo validation_errors(); ?>
+                </div>
+              <?php endif; ?>
 
-                        <div class="mb-3 row">
-                            <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_password'); ?></label>
-                            <div class="col-sm-10">
-                                <input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
-                            </div>
-                        </div>
+              <form role="form" autocomplete="off" class="form" method="post" action="<?php echo site_url('user/reset_password'); ?>/<?php echo $reset_code; ?>">
 
-                        <div class="mb-3 row">
-                            <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_confirm_password'); ?></label>
-                            <div class="col-sm-10">
-                                <input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
-                            </div>
-                        </div>
-
-                      <div class="mb-3">
-                        <input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
-                      </div>
-                      
-                      <input type="hidden" class="hide" name="token" id="token" value=""> 
-                    </form>
-    
+                <div class="mb-3 row">
+                  <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_password'); ?></label>
+                  <div class="col-sm-10">
+                    <input type="password" name="password" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
                   </div>
                 </div>
-              </div>
+
+                <div class="mb-3 row">
+                  <label for="inputPassword" class="col-sm-2 col-form-label"><?php echo lang('account_confirm_password'); ?></label>
+                  <div class="col-sm-10">
+                    <input type="password" name="password_confirm" class="form-control" id="inputPassword" placeholder="<?php echo lang('account_password'); ?>">
+                  </div>
+                </div>
+
+                <div class="mb-3">
+                  <input name="recover-submit" class="btn btn-lg btn-primary btn-block" value="<?php echo lang('account_reset_password'); ?>" type="submit">
+                </div>
+
+                <input type="hidden" class="hide" name="token" id="token" value="">
+              </form>
+
             </div>
           </div>
-	</div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
\ No newline at end of file