diff --git a/README.md b/README.md
index 044a3fc..1aa14f6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Just a basic demo of the most basic implementations of the [Joomla] (http://www.
 + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
 + *Name*: [Demo] (https://www.vdm.io/)
 + *First Build*: 5th August, 2015
-+ *Last Build*: 24th June, 2016
++ *Last Build*: 13th July, 2016
 + *Version*: 1.0.5
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index e8f820a..4b21501 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		admin.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 140cca2..496f730 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 734ced3..6c82d7c 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index e5cf423..c8cf403 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_documents.css
diff --git a/admin/assets/css/look.css b/admin/assets/css/look.css
index dc1211c..8ea861d 100644
--- a/admin/assets/css/look.css
+++ b/admin/assets/css/look.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.css
diff --git a/admin/assets/css/looks.css b/admin/assets/css/looks.css
index 97eb51f..658777f 100644
--- a/admin/assets/css/looks.css
+++ b/admin/assets/css/looks.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		looks.css
diff --git a/admin/controller.php b/admin/controller.php
index c411cba..e542153 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		controller.php
diff --git a/admin/controllers/demo.php b/admin/controllers/demo.php
index 47bb45c..b35cfc1 100644
--- a/admin/controllers/demo.php
+++ b/admin/controllers/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index 0dd0643..7478d83 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help.php
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index 25467f6..74d1113 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_document.php
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 215269e..d15c775 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_documents.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 54cccc8..de26e89 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		import.php
diff --git a/admin/controllers/look.php b/admin/controllers/look.php
index 36c3bb7..f812327 100644
--- a/admin/controllers/look.php
+++ b/admin/controllers/look.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.php
diff --git a/admin/controllers/looks.php b/admin/controllers/looks.php
index cda9ff0..5176131 100644
--- a/admin/controllers/looks.php
+++ b/admin/controllers/looks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		looks.php
diff --git a/admin/demo.php b/admin/demo.php
index 8ee32c1..c3c4a46 100644
--- a/admin/demo.php
+++ b/admin/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -24,7 +24,7 @@ defined('_JEXEC') or die('Restricted access');
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_demo'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
 };
 
 // Load cms libraries
diff --git a/admin/helpers/demo.php b/admin/helpers/demo.php
index 70580be..3801afa 100644
--- a/admin/helpers/demo.php
+++ b/admin/helpers/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -736,7 +736,7 @@ abstract class DemoHelper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index 12513f2..019be86 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		batch_.php
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 55f5e73..aabb0a3 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		batchselection.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 52588e8..cc27ecb 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index bbff867..f0a2dd3 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index 9911d86..ae13a75 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index d9f3af6..706a242 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index a33d6c8..b957e4e 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_under.php
diff --git a/admin/layouts/help_document/metadata.php b/admin/layouts/help_document/metadata.php
index 71d50b8..0331c72 100644
--- a/admin/layouts/help_document/metadata.php
+++ b/admin/layouts/help_document/metadata.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		metadata.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index 48775cf..a6fbd39 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		publishing.php
diff --git a/admin/layouts/look/details_above.php b/admin/layouts/look/details_above.php
index e90a46c..12755ee 100644
--- a/admin/layouts/look/details_above.php
+++ b/admin/layouts/look/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_above.php
diff --git a/admin/layouts/look/details_left.php b/admin/layouts/look/details_left.php
index 229e9b2..978383a 100644
--- a/admin/layouts/look/details_left.php
+++ b/admin/layouts/look/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_left.php
diff --git a/admin/layouts/look/details_right.php b/admin/layouts/look/details_right.php
index 7da4b74..cf948b0 100644
--- a/admin/layouts/look/details_right.php
+++ b/admin/layouts/look/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_right.php
diff --git a/admin/layouts/look/details_under.php b/admin/layouts/look/details_under.php
index a33d6c8..b957e4e 100644
--- a/admin/layouts/look/details_under.php
+++ b/admin/layouts/look/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		details_under.php
diff --git a/admin/layouts/look/metadata.php b/admin/layouts/look/metadata.php
index 71d50b8..0331c72 100644
--- a/admin/layouts/look/metadata.php
+++ b/admin/layouts/look/metadata.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		metadata.php
diff --git a/admin/layouts/look/publishing.php b/admin/layouts/look/publishing.php
index 48775cf..a6fbd39 100644
--- a/admin/layouts/look/publishing.php
+++ b/admin/layouts/look/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		publishing.php
diff --git a/admin/layouts/look/repetable_numbers_left.php b/admin/layouts/look/repetable_numbers_left.php
index 2a2c49a..3f28e4a 100644
--- a/admin/layouts/look/repetable_numbers_left.php
+++ b/admin/layouts/look/repetable_numbers_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		repetable_numbers_left.php
diff --git a/admin/layouts/look/repetable_numbers_right.php b/admin/layouts/look/repetable_numbers_right.php
index f0c0afc..e6f6e5a 100644
--- a/admin/layouts/look/repetable_numbers_right.php
+++ b/admin/layouts/look/repetable_numbers_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		repetable_numbers_right.php
diff --git a/admin/models/demo.php b/admin/models/demo.php
index 35a94b5..3b007ae 100644
--- a/admin/models/demo.php
+++ b/admin/models/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 21926b0..778d234 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		articles.php
@@ -126,16 +126,11 @@ class JFormFieldArticles extends JFormFieldList
 			// check if button was created for article field.
 			if (is_array($button) && count($button) > 0)
 			{
-				// Add some final script
-				$script[] = "
-					jQuery(document).ready(function() {
-						jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append');
-					});";
 				// Load the needed script.
 				$document = JFactory::getDocument();
 				$document->addScriptDeclaration(implode(' ',$script));
 				// return the button attached to input field.
-				return $html . implode('',$button);
+				return '<div class="input-append">' .$html . implode('',$button).'</div>';
 			}
 		}
 		return $html;
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 9d26c2d..6709c9d 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_document.js
diff --git a/admin/models/forms/look.js b/admin/models/forms/look.js
index 86472cb..b5500ed 100644
--- a/admin/models/forms/look.js
+++ b/admin/models/forms/look.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.js
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 4e4de89..ff31df1 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_document.php
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index 97a5255..4f8d332 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_documents.php
diff --git a/admin/models/import.php b/admin/models/import.php
index 95b712f..128b5af 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		import.php
@@ -193,7 +193,8 @@ class DemoModelImport extends JModelLegacy
 	protected function _getPackageFromUpload()
 	{		
 		// Get the uploaded file information
-		$input    = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
 		$userfile = $input->files->get('import_package', null, 'raw');
@@ -201,21 +202,21 @@ class DemoModelImport extends JModelLegacy
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_WARNIMPORTFILE'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_NO_FILE_SELECTED'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_WARNIMPORTUPLOADERROR'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
@@ -253,7 +254,8 @@ class DemoModelImport extends JModelLegacy
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the path to the package to import
 		$p_dir = $input->getString('import_directory');
@@ -261,7 +263,7 @@ class DemoModelImport extends JModelLegacy
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -271,7 +273,7 @@ class DemoModelImport extends JModelLegacy
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 		
 		// check the extention
@@ -282,7 +284,7 @@ class DemoModelImport extends JModelLegacy
 			break;
 			
 			default:
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}
@@ -302,15 +304,16 @@ class DemoModelImport extends JModelLegacy
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$input = JFactory::getApplication()->input;
-
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
+		
 		// Get the URL of the package to import
 		$url = $input->getString('import_url');
 
 		// Did you give us a URL?
 		if (!$url)
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_ENTER_A_URL'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -320,7 +323,7 @@ class DemoModelImport extends JModelLegacy
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_INVALID_URL'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -341,6 +344,7 @@ class DemoModelImport extends JModelLegacy
 	 */
 	protected function check($archivename)
 	{
+		$app	= JFactory::getApplication();
 		// Clean the name
 		$archivename = JPath::clean($archivename);
 		
@@ -354,7 +358,7 @@ class DemoModelImport extends JModelLegacy
 			default:
 			// Cleanup the import files
 			$this->remove($archivename);
-			JError::raiseWarning('', JText::_('COM_DEMO_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_DEMO_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}	
diff --git a/admin/models/look.php b/admin/models/look.php
index 294431d..4e153de 100644
--- a/admin/models/look.php
+++ b/admin/models/look.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.php
diff --git a/admin/models/looks.php b/admin/models/looks.php
index d5796e9..62b6620 100644
--- a/admin/models/looks.php
+++ b/admin/models/looks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		looks.php
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index f249000..af82ebe 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_document.php
diff --git a/admin/tables/look.php b/admin/tables/look.php
index 6366770..2cb9fb3 100644
--- a/admin/tables/look.php
+++ b/admin/tables/look.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.php
diff --git a/admin/views/demo/tmpl/default.php b/admin/views/demo/tmpl/default.php
index a08f535..f6966a6 100644
--- a/admin/views/demo/tmpl/default.php
+++ b/admin/views/demo/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default.php
diff --git a/admin/views/demo/tmpl/default_main.php b/admin/views/demo/tmpl/default_main.php
index c16b797..c476e91 100644
--- a/admin/views/demo/tmpl/default_main.php
+++ b/admin/views/demo/tmpl/default_main.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_main.php
diff --git a/admin/views/demo/tmpl/default_vdm.php b/admin/views/demo/tmpl/default_vdm.php
index 1756e00..472b65c 100644
--- a/admin/views/demo/tmpl/default_vdm.php
+++ b/admin/views/demo/tmpl/default_vdm.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_vdm.php
diff --git a/admin/views/demo/view.html.php b/admin/views/demo/view.html.php
index 1b831a5..3379acf 100644
--- a/admin/views/demo/view.html.php
+++ b/admin/views/demo/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index 7b8ed55..abfbc98 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		submitbutton.js
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 6b98bc6..f6808d9 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		edit.php
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index f20e463..88e3969 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index 5760516..6deeb7b 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default.php
diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php
index 3d6c180..534dc4e 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_batch_body.php
diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php
index e77ed0d..77b2d6b 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index fd66494..4f71f4f 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_body.php
diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php
index 95cde49..c73b35e 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_foot.php
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index 6892e34..86750e3 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_head.php
diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php
index 138fc04..c0fe0e2 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_toolbar.php
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index bc7e9ec..5ebe7ab 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 50d82b3..8b92cae 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default.php
@@ -24,6 +24,7 @@ defined('_JEXEC') or die('Restricted access');
 JHtml::_('jquery.framework');
 JHtml::_('bootstrap.tooltip');
 JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
 <?php if ($this->hasPackage && DemoHelper::checkArray($this->headerList)) : ?>
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 9af9622..335bd06 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/admin/views/look/submitbutton.js b/admin/views/look/submitbutton.js
index 5027a17..3667d03 100644
--- a/admin/views/look/submitbutton.js
+++ b/admin/views/look/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		submitbutton.js
diff --git a/admin/views/look/tmpl/edit.php b/admin/views/look/tmpl/edit.php
index e2e327d..2ce08c1 100644
--- a/admin/views/look/tmpl/edit.php
+++ b/admin/views/look/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		edit.php
diff --git a/admin/views/look/view.html.php b/admin/views/look/view.html.php
index 885e5ca..cc4cc74 100644
--- a/admin/views/look/view.html.php
+++ b/admin/views/look/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/admin/views/looks/tmpl/default.php b/admin/views/looks/tmpl/default.php
index ea814d6..f385caa 100644
--- a/admin/views/looks/tmpl/default.php
+++ b/admin/views/looks/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default.php
diff --git a/admin/views/looks/tmpl/default_batch_body.php b/admin/views/looks/tmpl/default_batch_body.php
index ae2125d..f92b061 100644
--- a/admin/views/looks/tmpl/default_batch_body.php
+++ b/admin/views/looks/tmpl/default_batch_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_batch_body.php
diff --git a/admin/views/looks/tmpl/default_batch_footer.php b/admin/views/looks/tmpl/default_batch_footer.php
index 82d9d24..66ce8b8 100644
--- a/admin/views/looks/tmpl/default_batch_footer.php
+++ b/admin/views/looks/tmpl/default_batch_footer.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/looks/tmpl/default_body.php b/admin/views/looks/tmpl/default_body.php
index 268b925..4f2fa5e 100644
--- a/admin/views/looks/tmpl/default_body.php
+++ b/admin/views/looks/tmpl/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_body.php
diff --git a/admin/views/looks/tmpl/default_foot.php b/admin/views/looks/tmpl/default_foot.php
index a7c8f15..f73a641 100644
--- a/admin/views/looks/tmpl/default_foot.php
+++ b/admin/views/looks/tmpl/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_foot.php
diff --git a/admin/views/looks/tmpl/default_head.php b/admin/views/looks/tmpl/default_head.php
index 7846325..b92348a 100644
--- a/admin/views/looks/tmpl/default_head.php
+++ b/admin/views/looks/tmpl/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_head.php
diff --git a/admin/views/looks/tmpl/default_toolbar.php b/admin/views/looks/tmpl/default_toolbar.php
index 75a663e..8e51944 100644
--- a/admin/views/looks/tmpl/default_toolbar.php
+++ b/admin/views/looks/tmpl/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default_toolbar.php
diff --git a/admin/views/looks/view.html.php b/admin/views/looks/view.html.php
index de4fb9c..6b8bd38 100644
--- a/admin/views/looks/view.html.php
+++ b/admin/views/looks/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/demo.xml b/demo.xml
index eb17ba3..e9a85f8 100644
--- a/demo.xml
+++ b/demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_DEMO</name>
-	<creationDate>24th June, 2016</creationDate>
+	<creationDate>13th July, 2016</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>info@vdm.io</authorEmail>
 	<authorUrl>https://www.vdm.io/</authorUrl>
diff --git a/script.php b/script.php
index cb453fb..67e5ef9 100644
--- a/script.php
+++ b/script.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		script.php
diff --git a/site/assets/css/site.css b/site/assets/css/site.css
index 83ab105..de23eeb 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		site.css
diff --git a/site/controller.php b/site/controller.php
index d0fc616..ee645a3 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		controller.php
diff --git a/site/controllers/help.php b/site/controllers/help.php
index 60b5ed2..8c6b605 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help.php
diff --git a/site/demo.php b/site/demo.php
index f13184b..d19822a 100644
--- a/site/demo.php
+++ b/site/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
diff --git a/site/helpers/demo.php b/site/helpers/demo.php
index 3823a73..b8cb537 100644
--- a/site/helpers/demo.php
+++ b/site/helpers/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -235,7 +235,7 @@ abstract class DemoHelper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index dfd83cf..c2721b5 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		headercheck.php
diff --git a/site/helpers/route.php b/site/helpers/route.php
index 751b602..a0f66b6 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		route.php
diff --git a/site/router.php b/site/router.php
index abe5d81..eeccac5 100644
--- a/site/router.php
+++ b/site/router.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			24th June, 2016
+	@build			13th July, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		router.php