diff --git a/app/Views/login.php b/app/Views/login.php
index 9479789f4..29df071f6 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -10,25 +10,22 @@
 <!doctype html>
 <html lang="<?= current_language_code() ?>">
 	<head>
-	  <meta charset="utf-8">
+		<meta charset="utf-8">
 		<base href="<?= base_url() ?>">
 		<title><?= config('OSPOS')->settings['company'] . '&nbsp;|&nbsp;' . lang('Common.software_short') . '&nbsp;|&nbsp;' .  lang('Login.login') ?></title>
-
 		<meta content="width=device-width, initial-scale=1" name="viewport">
 		<meta content="noindex, nofollow" name="robots">
-
-		<link href="<?= base_url('/favicon.ico') ?>" rel="shortcut icon" type="image/x-icon">
+		<link href="<?= base_url('images/favicon.ico') ?>" rel="shortcut icon" type="image/x-icon">
 		<?php
-			$theme = (empty(config('OSPOS')->settings['theme'])
-				|| 'paper' == config('OSPOS')->settings['theme']
-				|| 'readable' == config('OSPOS')->settings['theme']
-					? 'flatly'
-					: config('OSPOS')->settings['theme']);
+			$theme = (empty(config('OSPOS')->settings['theme']) 
+					|| 'paper' == config('OSPOS')->settings['theme']
+					|| 'readable' == config('OSPOS')->settings['theme']
+						? 'flatly'
+						: config('OSPOS')->settings['theme']);
 		?>
-		<link href="<?= base_url("/dist/bootswatch/$theme/bootstrap.min.css") ?>" rel="stylesheet" type="text/css">
-
+		<link href="<?= base_url("dist/bootswatch/$theme/bootstrap.min.css") ?>" rel="stylesheet" type="text/css">
 		<!-- start css template tags -->
-		<link rel="stylesheet" type="text/css" href="<?= base_url('/css/login.min.css') ?>"/>
+		<link rel="stylesheet" type="text/css" href="<?= base_url('css/login.min.css') ?>"/>
 		<!-- end css template tags -->
 		<meta content="#2c3e50" name="theme-color">
 	</head>
@@ -37,82 +34,80 @@
 			<div class="container-login container-fluid d-flex flex-column flex-md-row bg-body shadow rounded m-3 p-4 p-md-0">
 				<div class="box-logo d-flex flex-column justify-content-center align-items-center border-end px-4 pb-3 p-md-4">
 					<?php if (config('OSPOS')->settings['company_logo']): ?>
-						<img class="logo w-100" src="<?php echo 'uploads/' . config('OSPOS')->settings['company_logo'] ?>" alt="<?php echo lang('Common.logo') . '&nbsp;' . config('OSPOS')->settings['company'] ?>">
+						<img class="logo w-100" src="<?= base_url('../writable/uploads/' . config('OSPOS')->settings['company_logo']) ?>" alt="<?= lang('Common.logo') . '&nbsp;' . config('OSPOS')->settings['company'] ?>">
 					<?php else: ?>
 						<svg class="logo text-primary" role="img" viewBox="0 0 308.57998 308.57997" xmlns="http://www.w3.org/2000/svg">
-							<title><?php echo lang('Common.software_title') . '&nbsp;' . lang('Common.logo') ?></title>
+							<title><?= lang('common_software_title') . '&nbsp;' . lang('common_logo') ?></title>
 							<circle cx="154.28999" cy="154.28999" r="154.28999" fill="currentColor"/>
 							<path fill="#fff" d="M154.88998 145.66999c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63-10.59-11.92-25.86-19.59-43.02-19.59-31.86 0-57.77 25.91-57.77 57.77 0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zm-57.75 38.33c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69 30.69 13.77 30.69 30.69-13.77 30.69-30.69 30.69zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54v-61.47h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
 						</svg>
 					<?php endif; ?>
 				</div>
 				<section class="box-login d-flex flex-column justify-content-center align-items-center p-md-4">
-					<?php echo form_open('login') ?>
-					<h3 class="text-center m-0"><?php echo lang('Login.welcome', ['install_name' => lang('Common.software_short')]) ?></h3>
+					<?= form_open('login') ?>
+					<h3 class="text-center m-0"><?= lang('Login.welcome', ['install_name' => lang('Common.software_short')]) ?></h3>
 					<?php if ($has_errors): ?>
 						<div class="alert alert-danger mt-3">
-							<?php echo validation_list_errors(); ?>
+							<?= validation_list_errors() ?>
 						</div>
 					<?php endif; ?>
-
-					<?php if(!$is_latest): ?>
-					<div class="alert alert-info mt-3">
-						<?php echo lang('Login.migration_needed', ['version' => $latest_version]) ?>
-					</div>
+					<?php if (!$is_latest): ?>
+						<div class="alert alert-info mt-3">
+							<?= lang('Login.migration_needed', ['version' => $latest_version]) ?>
+						</div>
 					<?php endif; ?>
-
-					<?php if (empty(config('OSPOS')->settings['login_form']) || 'floating_labels'==(config('OSPOS')->settings['login_form'])): ?>
+					<?php if (empty(config('OSPOS')->settings['Login.form']) || 'floating_labels'==(config('OSPOS')->settings['Login.form'])): ?>
 						<div class="form-floating mt-3">
-							<input class="form-control" id="input-username" name="username" type="text" placeholder="<?php echo lang('Login.username') ?>">
-							<label for="input-username"><?php echo lang('Login.username') ?></label>
+							<input class="form-control" id="input-username" name="username" type="text" placeholder="<?= lang('Login.username') ?>">
+							<label for="input-username"><?= lang('Login.username') ?></label>
 						</div>
 						<div class="form-floating mb-3">
-							<input class="form-control" id="input-password" name="password" type="password" placeholder="<?php echo lang('Login.password') ?>">
-							<label for="input-password"><?php echo lang('Login.password') ?></label>
+							<input class="form-control" id="input-password" name="password" type="password" placeholder="<?= lang('Login.password') ?>">
+							<label for="input-password"><?= lang('Login.password') ?></label>
 						</div>
-					<?php elseif ('input_groups'==(config('OSPOS')->settings['login_form'])): ?>
+					<?php elseif ('input_groups'==(config('OSPOS')->settings['Login.form'])): ?>
 						<div class="input-group mt-3">
-							<span class="input-group-text" id="input-username">
-								<svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-									<title><?php echo lang('Common.icon') . '&nbsp;' . lang('Login.username') ?></title>
-									<path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
-								</svg>
-							</span>
-							<input class="form-control" name="username" type="text" placeholder="<?php echo lang('Login.username'); ?>" aria-label="<?php echo lang('Login.username') ?>" aria-describedby="input-username" <?php if (ENVIRONMENT == "testing") echo "value='admin'"; ?>>
+				  <span class="input-group-text" id="input-username">
+					<svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+					  <title><?= lang('Common.icon') . '&nbsp;' . lang('Login.username') ?></title>
+					  <path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
+					</svg>
+				  </span>
+							<input class="form-control" name="username" type="text" placeholder="<?= lang('Login.username'); ?>" aria-label="<?= lang('Login.username') ?>" aria-describedby="input-username" <?php if (ENVIRONMENT == "testing") echo "value='admin'"; ?>>
 						</div>
 						<div class="input-group mb-3">
-							<span class="input-group-text" id="input-password">
-								<svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-									<title><?php echo lang('Common.icon') . '&nbsp;' . lang('Login.password') ?></title>
-									<path d="M3.5 11.5a3.5 3.5 0 1 1 3.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 0 1-3.163 2zM2.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
-								</svg>
-							</span>
-							<input class="form-control" name="password" type="password" placeholder="<?php echo lang('Login.password') ?>" aria-label="<?php echo lang('Login.password'); ?>" <?php if (ENVIRONMENT == "testing") echo "value='pointofsale'"; ?>" aria-describedby="input-password">
+				  <span class="input-group-text" id="input-password">
+					<svg class="bi" fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+					  <title><?= lang('common_icon') . '&nbsp;' . lang('Login.password') ?></title>
+					  <path d="M3.5 11.5a3.5 3.5 0 1 1 3.163-5H14L15.5 8 14 9.5l-1-1-1 1-1-1-1 1-1-1-1 1H6.663a3.5 3.5 0 0 1-3.163 2zM2.5 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
+					</svg>
+				  </span>
+							<input class="form-control" name="password" type="password" placeholder="<?= lang('Login.password') ?>" aria-label="<?= lang('Login.password') ?>" <?php if (ENVIRONMENT == "testing") echo "value='pointofsale'"; ?>" aria-describedby="input-password">
 						</div>
 					<?php endif; ?>
-
-					<?php if($gcaptcha_enabled)
-					{
-						echo '<script src="https://www.google.com/recaptcha/api.js"></script>';
-						echo '<div class="g-recaptcha mb-3" style="text-align: center;" data-sitekey="' . config('OSPOS')->settings['gcaptcha_site_key'] . '"></div>';
-					} ?>
+					<?php
+						if($gcaptcha_enabled)
+						{
+							echo '<script src="https://www.google.com/recaptcha/api.js"></script>';
+							echo '<div class="g-recaptcha mb-3" style="text-align: center;" data-sitekey="' . config('OSPOS')->settings['gcaptcha_site_key'] . '"></div>';
+						}
+					?>
 					<div class="d-grid">
-						<button class="btn btn-lg btn-primary" name="login-button" type="submit" ><?php echo lang('Login.go') ?></button>
+						<button class="btn btn-lg btn-primary" name="login-button" type="submit" ><?= lang('Login.go') ?></button>
 					</div>
-
-					<?php echo form_close() ?>
+					<?= form_close() ?>
 				</section>
 			</div>
 		</main>
 		<footer class="d-flex justify-content-center flex-shrink-0 text-center">
 			<div class="footer container-fluid bg-body rounded shadow p-3 mb-md-4 mx-md-3">
-				<span class="text-muted">
-					<svg height="1em" role="img" viewBox="0 0 229.85 143.05001" xmlns="http://www.w3.org/2000/svg">
-						<title><?php echo lang('Common.software_short') . '&nbsp;' . lang('Common.logo_mark') ?></title>
-						<path fill="currentColor" d="M115.51 50.18c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63C90.2 7.71 74.93.04 57.77.04 25.91.04 0 25.95 0 57.81c0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zM57.76 88.51c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69S88.45 40.9 88.45 57.82 74.68 88.51 57.76 88.51zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54V27.07h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
-					</svg>
-				</span>
-				<span><?php echo lang('Common.software_title') ?></span>
+			  <span class="text-muted">
+				<svg height="1em" role="img" viewBox="0 0 229.85 143.05001" xmlns="http://www.w3.org/2000/svg">
+				  <title><?= lang('Common.software_short') . '&nbsp;' . lang('Common.logo_mark') ?></title>
+				  <path fill="currentColor" d="M115.51 50.18c-.03-1.26-.03-3.29.19-4.29 4.6-11.1 15.57-18.82 28.3-18.82h.41v58.3c0 .12-.03.78-.04.9-.54 16.46-14.01 29.7-30.59 29.7v27.08c21 0 39.17-11.27 49.29-28.07l.07-.11c2.9.45 5.86.75 8.9.75 31.95 0 57.81-26 57.81-57.81 0-30.87-24.37-56.46-55.1-57.81h-30.74c-17.18 0-32.61 7.64-43.22 19.63C90.2 7.71 74.93.04 57.77.04 25.91.04 0 25.95 0 57.81c0 31.86 25.91 57.77 57.77 57.77 31.86 0 57.77-25.91 57.77-57.77v-3.68c-.01.01-.02-3.31-.03-3.95zM57.76 88.51c-16.92 0-30.69-13.77-30.69-30.69s13.77-30.69 30.69-30.69S88.45 40.9 88.45 57.82 74.68 88.51 57.76 88.51zm142.96-19.87c-4.33 11.64-15.57 19.9-28.7 19.9h-.54V27.07h.54c13.13 0 24.37 8.26 28.7 19.9 1.35 3.25 2.03 6.91 2.03 10.83s-.67 7.59-2.03 10.84z"/>
+				</svg>
+			  </span>
+				<span><?= lang('Common.software_title') ?></span>
 			</div>
 		</footer>
 	</body>
