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 0c5a29c1..22ba8775 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -1,34 +1,7 @@
-<!-- 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" />
-
-
 <div id="container">
 
-
-<?php if($this->session->flashdata('notice') != '') { ?>
-<div class="alert-message info">
-        <?php echo $this->session->flashdata('notice'); ?>
-</div>
-<?php } ?>
-
-<?php if($this->session->flashdata('error') != '') { ?>
-<div class="alert-message error">
-        <?php echo $this->session->flashdata('error'); ?>
-</div>
-<?php } ?>
-
-<?php if(validation_errors()) { ?>
-<div class="alert-message error">
-        <?php echo validation_errors(); ?>
-</div>
-<?php } ?>
-
 <h2>Log in</h2>
-
+<?php $this->load->view('layout/messages'); ?>
 
 <form method="post" action="<?php echo site_url('user/login'); ?>" name="users">
 <table>