diff --git a/application/views/home.php b/application/views/home.php
index 004c70001..9fed3613d 100644
--- a/application/views/home.php
+++ b/application/views/home.php
@@ -1,16 +1,15 @@
 <?php $this->load->view("partial/header"); ?>
-<br />
-<h3><?php echo $this->lang->line('common_welcome_message'); ?></h3>
+
+<h3 class="text-center"><?php echo $this->lang->line('common_welcome_message'); ?></h3>
+
 <div id="home_module_list">
 	<?php
 	foreach($allowed_modules->result() as $module)
 	{
 	?>
-		<div class="module_item">
-			<a href="<?php echo site_url("$module->module_id");?>">
-			<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image" /></a><br />
+		<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
+			<a href="<?php echo site_url("$module->module_id");?>"><img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image" /></a>
 			<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
-			 - <?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>
 		</div>
 	<?php
 	}
diff --git a/application/views/login.php b/application/views/login.php
index a6d04e1a0..a97179df9 100644
--- a/application/views/login.php
+++ b/application/views/login.php
@@ -6,6 +6,8 @@
 	<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
 	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
 	<link rel="stylesheet" type="text/css" href="css/login.css" />
+	<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
+	<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
 	<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
 	<script type="text/javascript">
 		$(document).ready(function()
@@ -41,7 +43,7 @@
 					'size'=>'20')); ?>
 				</div>
 				
-				<div id="submit_button"><?php echo form_submit('loginButton', 'Go'); ?> </div>
+				<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
 			</div>
 		</div>
 
diff --git a/application/views/partial/footer.php b/application/views/partial/footer.php
index 7f0f9922e..9472f79e1 100644
--- a/application/views/partial/footer.php
+++ b/application/views/partial/footer.php
@@ -2,11 +2,13 @@
 	</div>
 
 	<div id="footer">
-		<?php echo $this->lang->line('common_you_are_using_ospos'); ?>
-		<?php echo $this->config->item('application_version'); ?>.
-		<?php echo $this->lang->line('common_please_visit_my'); ?>
-		<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
-		<?php echo $this->lang->line('common_learn_about_project'); ?>
+		<div class="jumbotron">
+			<?php echo $this->lang->line('common_you_are_using_ospos'); ?>
+			<?php echo $this->config->item('application_version'); ?>.
+			<?php echo $this->lang->line('common_please_visit_my'); ?>
+			<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
+			<?php echo $this->lang->line('common_learn_about_project'); ?>
+		</div>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index eb5453da8..0717f13dd 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -7,7 +7,9 @@
 	<link rel="shortcut icon" type="image/x-icon" href="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" />
-	
+	<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
+	<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
+
 	<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
 		<!-- start js template tags -->
 		<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
@@ -66,38 +68,48 @@
 </head>
 
 <body>
-	<div id="menubar">
-		<div id="menubar_container">
-			<div id="menubar_company_info">
-				<span id="company_title"><?php echo $this->config->item('company'); ?></span><br />
-				<span style='font-size:8pt;'><?php echo $this->lang->line('common_powered_by').' Open Source Point Of Sale'; ?></span>
-			</div>
+	<div class="wrapper">
 
-			<div id="menubar_navigation">
-				<?php
-				foreach($allowed_modules->result() as $module)
-				{
-				?>
-					<div class="menu_item">
-						<a href="<?php echo site_url("$module->module_id");?>">
-						<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image"></a><br>
-						<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
-					</div>
-				<?php
-				}
-				?>
+	<div class="topbar">
+		<div class="container">
+			<div class="navbar-left">
+				<div id="liveclock"><?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?></div>
 			</div>
-			
-			<div id="menubar_footer">
+			<div class="navbar-right" style="margin:0">
 				<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
 				<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
 			</div>
-			
-			<div id="menubar_date">
-				<div id="liveclock"><?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?></div>
-			</div>
 		</div>
 	</div>
-	<div id="content_area_wrapper">
-	<div id="content_area">
+
+	<div class="navbar navbar-default" role="navigation">
+		<div class="container">
+			<div class="navbar-header">
+				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+					<span class="sr-only">Toggle navigation</span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+				</button>
+		
+				<a class="navbar-brand hidden-sm" href="<?php echo site_url(); ?>">OSPOS</a>
+			</div>
+
+			<div class="navbar-collapse collapse">
+				<ul class="nav navbar-nav navbar-right">
+					<?php foreach($allowed_modules->result() as $module): ?>
+					<li class="<?php echo $module->module_id == $this->uri->segment(1)? 'active': ''; ?>">
+						<a href="<?php echo site_url("$module->module_id");?>" title="<?php echo $this->lang->line("module_".$module->module_id) ?>" class="menu-icon">
+							<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Module Icon" /><br />
+							<?php echo $this->lang->line("module_".$module->module_id) ?>
+						</a>
+					</li>
+					<?php endforeach; ?>
+				</ul>
+			</div><!--/.nav-collapse -->
+		</div>
+	</div>
+
+	<div class="container" id="main_container">
+		<div class="row">
  
\ No newline at end of file
diff --git a/templates/flatly/views/home.php b/templates/flatly/views/home.php
deleted file mode 100644
index 9fed3613d..000000000
--- a/templates/flatly/views/home.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php $this->load->view("partial/header"); ?>
-
-<h3 class="text-center"><?php echo $this->lang->line('common_welcome_message'); ?></h3>
-
-<div id="home_module_list">
-	<?php
-	foreach($allowed_modules->result() as $module)
-	{
-	?>
-		<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
-			<a href="<?php echo site_url("$module->module_id");?>"><img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image" /></a>
-			<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
-		</div>
-	<?php
-	}
-	?>
-</div>
-<?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/templates/flatly/views/login.php b/templates/flatly/views/login.php
deleted file mode 100644
index a97179df9..000000000
--- a/templates/flatly/views/login.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<!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" />
-	<base href="<?php echo base_url();?>" />
-	<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
-	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
-	<link rel="stylesheet" type="text/css" href="css/login.css" />
-	<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
-	<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
-	<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></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 id="login">
-		<?php echo form_open('login') ?>
-
-		<div id="container">
-			<?php echo validation_errors(); ?>
-			
-			<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>
-				
-				<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
-			</div>
-		</div>
-
-		<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
-	</div>
-</body>
-</html>
diff --git a/templates/flatly/views/partial/footer.php b/templates/flatly/views/partial/footer.php
deleted file mode 100644
index 9472f79e1..000000000
--- a/templates/flatly/views/partial/footer.php
+++ /dev/null
@@ -1,14 +0,0 @@
-		</div>
-	</div>
-
-	<div id="footer">
-		<div class="jumbotron">
-			<?php echo $this->lang->line('common_you_are_using_ospos'); ?>
-			<?php echo $this->config->item('application_version'); ?>.
-			<?php echo $this->lang->line('common_please_visit_my'); ?>
-			<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
-			<?php echo $this->lang->line('common_learn_about_project'); ?>
-		</div>
-	</div>
-</body>
-</html>
diff --git a/templates/flatly/views/partial/header.php b/templates/flatly/views/partial/header.php
deleted file mode 100644
index 109f921ef..000000000
--- a/templates/flatly/views/partial/header.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<!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="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" />
-	<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
-	<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
-
-	<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
-		<!-- start js template tags -->
-		<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
-		<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
-		<script type="text/javascript" src="js/common.js" language="javascript"></script>
-		<script type="text/javascript" src="js/date.js" language="javascript"></script>
-		<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
-		<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
-		<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
-		<script type="text/javascript" src="js/phpjsdate.js" language="javascript"></script>
-		<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
-		<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
-		<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
-		<!-- end js template tags -->
-	<?php else : ?>
-		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a8ae30ad50" language="javascript"></script>
-		<!-- end minjs template tags -->       
-	<?php endif; ?>
-
-	<script type="text/javascript">
-		// live clock
-	
-		function clockTick() {  
-			setInterval('updateClock();', 1000);  
-		}
-
-		// start the clock immediatly
-		clockTick();
-
-		var now = new Date(<?php echo time() * 1000 ?>);
-
-		function updateClock() {
-			now.setTime(now.getTime() + 1000);
-			
-			document.getElementById('liveclock').innerHTML = phpjsDate("<?php echo $this->config->item('dateformat').' '.$this->config->item('timeformat') ?>", now);
-		}
-	</script>
-
-	<style type="text/css">
-		html {
-			overflow: auto;
-		}
-	</style>
-</head>
-
-<body>
-	<div class="wrapper">
-
-	<div class="topbar">
-		<div class="container">
-			<div class="navbar-left">
-				<div id="liveclock"><?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?></div>
-			</div>
-			<div class="navbar-right" style="margin:0">
-				<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
-				<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
-			</div>
-		</div>
-	</div>
-
-	<div class="navbar navbar-default" role="navigation">
-		<div class="container">
-			<div class="navbar-header">
-				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-					<span class="sr-only">Toggle navigation</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-		
-				<a class="navbar-brand hidden-sm" href="<?php echo site_url(); ?>">OSPOS</a>
-			</div>
-
-			<div class="navbar-collapse collapse">
-				<ul class="nav navbar-nav navbar-right">
-					<?php foreach($allowed_modules->result() as $module): ?>
-					<li class="<?php echo $module->module_id == $this->uri->segment(1)? 'active': ''; ?>">
-						<a href="<?php echo site_url("$module->module_id");?>" title="<?php echo $this->lang->line("module_".$module->module_id) ?>" class="menu-icon">
-							<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Module Icon" /><br />
-							<?php echo $this->lang->line("module_".$module->module_id) ?>
-						</a>
-					</li>
-					<?php endforeach; ?>
-				</ul>
-			</div><!--/.nav-collapse -->
-		</div>
-	</div>
-
-	<div class="container">
-		<div class="row">
- 
\ No newline at end of file