diff --git a/application/views/login.php b/application/views/login.php
index 2fb5e8089..1e153dbc6 100644
--- a/application/views/login.php
+++ b/application/views/login.php
@@ -1,64 +1,49 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/login.css" />
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
-<script src="<?php echo base_url();?>js/jquery-1.8.3.js" type="text/javascript" language="javascript" charset="UTF-8"></script>
-<script type="text/javascript">
-$(document).ready(function()
-{
-	$("#login_form input:first").focus();
-});
-</script>
-
-<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
-
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/login.css" />
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
+	<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
+	<script src="<?php echo base_url();?>js/jquery-1.8.3.js" type="text/javascript" language="javascript" charset="UTF-8"></script>
+	<script type="text/javascript">
+		$(document).ready(function()
+		{
+			$("#login_form input:first").focus();
+		});
+	</script>
 </head>
 
 <body>
+	<div align="center" style="margin-top:10px"><img src=<?php echo base_url();?>/images/logo.gif></div>
 
-<div align="center" style="margin-top:10px"><img src=<?php echo base_url();?>/images/logo.gif>
-
-</div>
-
-<div id="login">
-  
-  
-
-<?php echo form_open('login') ?>
-<div id="container">
-<?php echo validation_errors(); ?>
-	
-	<div id="login_form">
+	<div id="login">
 
+	<?php echo form_open('login') ?>
+	<div id="container">
+		<?php echo validation_errors(); ?>
 		
-		<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
-		<div class="form_field">
-		<?php echo form_input(array(
-		'name'=>'username',
-		'id'=>'username',
-		'size'=>'20')); ?>
+		<div id="login_form">
+			<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
+			<div class="form_field">
+				<?php echo form_input(array(
+				'name'=>'username',
+				'id'=>'username',
+				'size'=>'20')); ?>
+			</div>
+
+			<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
+			<div class="form_field">
+				<?php echo form_password(array(
+				'name'=>'password',
+				'id' => 'password',
+				'size'=>'20')); ?>
+			</div>
+			
+			<div id="submit_button"><?php echo form_submit('loginButton','Go'); ?> </div>
 		</div>
-
-		<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
-		<div class="form_field">
-		<?php echo form_password(array(
-		'name'=>'password',
-		'id' => 'password',
-		'size'=>'20')); ?>
-		
-		</div>
-		
-		<div id="submit_button">
-		<?php echo form_submit('loginButton','Go'); ?>
-		</div>
-		
-		
 	</div>
-	
-</div>
-<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
+	<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
 </body>
 </html>
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 7336f2fdc..39e5fa533 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<base href="<?php echo base_url();?>" />
 	<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?></title>
+	<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
 	<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
 	<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
 	<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
@@ -50,14 +50,11 @@
 			}
 		}
 	</script>	
-<style type="text/css">
-html {
-    overflow: auto;
-}
-</style>
-
-<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
-
+	<style type="text/css">
+	html {
+		overflow: auto;
+	}
+	</style>
 </head>
 
 <body>
