diff --git a/application/controllers/user.php b/application/controllers/user.php
index 93e1d631..3bbe33c7 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -305,14 +305,11 @@ class User extends CI_Controller {
 		$this->form_validation->set_rules('user_name', 'Username', 'required');
 		$this->form_validation->set_rules('user_password', 'Password', 'required');
 
-		$data = $query->row();
-
+		$data['user'] = $query->row();
 
 		if ($this->form_validation->run() == FALSE)
 		{
-
-			//$data['page_title'] = Login;
-
+			$data['page_title'] = "Login";
 			$this->load->view('layout/header', $data);
 			$this->load->view('user/login');
 			$this->load->view('layout/footer');
@@ -321,10 +318,10 @@ class User extends CI_Controller {
 		{
 			if($this->user_model->login() == 1) {
 				$this->session->set_flashdata('notice', 'User logged in');
-				$this->user_model->update_session($data->user_id);
+				$this->user_model->update_session($data['user']->user_id);
 				redirect('dashboard');
 			} else {
-				$this->session->set_flashdata('notice', 'Incorrect username or password!');
+				$this->session->set_flashdata('error', 'Incorrect username or password!');
 				redirect('user/login');
 			}
 		}
diff --git a/application/views/layout/messages.php b/application/views/layout/messages.php
new file mode 100644
index 00000000..da832f21
--- /dev/null
+++ b/application/views/layout/messages.php
@@ -0,0 +1,32 @@
+<!-- JS -->
+<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
+<script type="text/javascript" src="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>/fancybox/jquery.fancybox-1.3.4.css" media="screen" />
+
+<!-- Display Notices -->
+<?php if($this->session->flashdata('notice') != '') { ?>
+<div class="alert-message info">
+        <?php echo $this->session->flashdata('notice'); ?>
+</div>
+<?php } ?>
+
+<!-- Display Warnings -->
+<?php if($this->session->flashdata('warning') != '') { ?>
+<div class="alert-message warning">
+        <?php echo $this->session->flashdata('warning'); ?>
+</div>
+<?php } ?>
+
+<!-- Display Errors -->
+<?php if($this->session->flashdata('error') != '') { ?>
+<div class="alert-message error">
+        <?php echo $this->session->flashdata('error'); ?>
+</div>
+<?php } ?>
+
+<!-- Display form validation errors -->
+<?php if(validation_errors()) { ?>
+<div class="alert-message error">
+        <?php echo validation_errors(); ?>
+</div>
+<?php } ?>
\ No newline at end of file
diff --git a/application/views/lotw/export.php b/application/views/lotw/export.php
index 1f755828..ddb7e94f 100644
--- a/application/views/lotw/export.php
+++ b/application/views/lotw/export.php
@@ -1,11 +1,7 @@
 <div id="container">
-<h2><?php echo $page_title; ?></h2>
 
-	<?php if($this->session->flashdata('warning')) { ?>
-    <div id="message" >
-        <?php echo $this->session->flashdata('warning'); ?>
-    </div>
-	<?php } ?>
+<h2><?php echo $page_title; ?></h2>
+<?php $this->load->view('layout/messages'); ?>
 
 	<h4>Step 1</h4>
 		<a href="<?php echo site_url('adif/export_lotw'); ?>" title="Export LoTW" target="_blank">Export an ADIF</a> file of QSOs that have not been uploaded to LoTW.
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php
index beb32d69..2e346124 100644
--- a/application/views/lotw/import.php
+++ b/application/views/lotw/import.php
@@ -1,5 +1,6 @@
 <div id="container">
 <h2><?php echo $page_title; ?></h2>
+<?php $this->load->view('layout/messages'); ?>
 
 <?php echo form_open_multipart('lotw/import');?>
 <table>
diff --git a/application/views/user/login.php b/application/views/user/login.php
index b09a5df6..22ba8775 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -1,7 +1,7 @@
 <div id="container">
-<h2>Log in</h2>
 
-<?php echo validation_errors(); ?>
+<h2>Log in</h2>
+<?php $this->load->view('layout/messages'); ?>
 
 <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
 <table>