diff --git a/README.md b/README.md
index 4ea4791..e52c6c6 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*: 20th March, 2016
++ *Last Build*: 2nd May, 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
@@ -23,11 +23,11 @@ due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builde
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **16672**
++ *Line count*: **16713**
 + *File count*: **152**
 + *Folder count*: **50**
 
-**30 Hours** or **4 Eight Hour Days** (the actual time the author spent)
+**31 Hours** or **4 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @12hours** = codingtime / 4;
@@ -35,7 +35,7 @@ due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builde
 > **mapping @5hours** = codingtime / 10;
 > **office @8hours** = codingtime / 6;)
 
-**77 Hours** or **10 Eight Hour Days**
+**78 Hours** or **10 Eight Hour Days**
 (a total of the realistic time frame for this project)
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 2beea36..d97b4db 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 7fb5f99..66a5ad2 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 572cd7b..3b3fa29 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 59d1466..ba403d3 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 0f9e433..59e7c83 100644
--- a/admin/assets/css/look.css
+++ b/admin/assets/css/look.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 38f28ef..08800ce 100644
--- a/admin/assets/css/looks.css
+++ b/admin/assets/css/looks.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		looks.css
diff --git a/admin/config.xml b/admin/config.xml
index aed7798..0585a2e 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset
+		addrulepath="/administrator/components/com_demo/models/rules"
+		addfieldpath="/administrator/components/com_demo/models/fields"
 		name="global_config"
 		label="COM_DEMO_CONFIG_GLOBAL_LABEL"
 		description="COM_DEMO_CONFIG_GLOBAL_DESC">
diff --git a/admin/controller.php b/admin/controller.php
index 8823090..96313ac 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		controller.php
diff --git a/admin/controllers/demo.php b/admin/controllers/demo.php
index 7de1e7c..06aa3af 100644
--- a/admin/controllers/demo.php
+++ b/admin/controllers/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index 5343211..eaf3a3e 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 f9c8191..f958ba4 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 127e00e..3d5b05a 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_documents.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index b05f28c..c65b1fc 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		import.php
diff --git a/admin/controllers/look.php b/admin/controllers/look.php
index 43a6a7f..4c10c72 100644
--- a/admin/controllers/look.php
+++ b/admin/controllers/look.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.php
diff --git a/admin/controllers/looks.php b/admin/controllers/looks.php
index b653709..9785b22 100644
--- a/admin/controllers/looks.php
+++ b/admin/controllers/looks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		looks.php
diff --git a/admin/demo.php b/admin/demo.php
index a9faa5f..28bd053 100644
--- a/admin/demo.php
+++ b/admin/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -38,7 +38,7 @@ $document->addStyleSheet('components/com_demo/assets/css/admin.css');
 $document->addScript('components/com_demo/assets/js/admin.js');
 
 // require helper files
-JLoader::register('DemoHelper', dirname(__FILE__) . '/helpers/demo.php');
+JLoader::register('DemoHelper', dirname(__FILE__) . '/helpers/demo.php'); 
 JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 
 
 // import joomla controller library
diff --git a/admin/helpers/demo.php b/admin/helpers/demo.php
index 752624a..674c563 100644
--- a/admin/helpers/demo.php
+++ b/admin/helpers/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -442,7 +442,7 @@ abstract class DemoHelper
 		$query = $db->getQuery(true);
 		$query->select(array('a.published'));
 		$query->from('#__demo_'.$type.' AS a');
-		$query->where('a.id = '.$id);
+		$query->where('a.id = '. (int) $id);
 		$query->where('a.published = 1');
 		$db->setQuery($query);
 		$db->execute();
@@ -460,7 +460,7 @@ abstract class DemoHelper
 		$query = $db->getQuery(true);
 		$query->select(array('a.title'));
 		$query->from('#__usergroups AS a');
-		$query->where('a.id = '.$id);
+		$query->where('a.id = '. (int) $id);
 		$db->setQuery($query);
 		$db->execute();
 		$found = $db->getNumRows();
@@ -1082,7 +1082,7 @@ abstract class DemoHelper
 					$w .= ' ';
 					if($r < 100)
 					{
-						$word .= 'and ';
+						$w .= 'and ';
 					}
 					$w .= self::numberToString($r);
 				}
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index 1aecc82..36cec6f 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		batch_.php
diff --git a/admin/language/en-GB/en-GB.com_demo.sys.ini b/admin/language/en-GB/en-GB.com_demo.sys.ini
index 33a636e..e933f43 100644
--- a/admin/language/en-GB/en-GB.com_demo.sys.ini
+++ b/admin/language/en-GB/en-GB.com_demo.sys.ini
@@ -1,4 +1,4 @@
-COM_DEMO="Demo"
+COM_DEMO="Demo Configuration"
 COM_DEMO_CONFIGURATION="Demo Configuration"
 COM_DEMO_MENU="&#187; Demo"
 COM_DEMO_MENU_HELP_DOCUMENTS="Help Documents"
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 6d2cfbf..9d6009d 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 2a58997..b0992ce 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			20th March, 2016
+	@build			2nd May, 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 2d186c8..519b60b 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			20th March, 2016
+	@build			2nd May, 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 7830612..94f6373 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			20th March, 2016
+	@build			2nd May, 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 e8b2dab..445542f 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			20th March, 2016
+	@build			2nd May, 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 b628769..74f43dd 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			20th March, 2016
+	@build			2nd May, 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 2dddb86..ee6ec55 100644
--- a/admin/layouts/help_document/metadata.php
+++ b/admin/layouts/help_document/metadata.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 e3ef3c5..81cda70 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 395196e..32eea5e 100644
--- a/admin/layouts/look/details_above.php
+++ b/admin/layouts/look/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 6a7fbe6..1937742 100644
--- a/admin/layouts/look/details_left.php
+++ b/admin/layouts/look/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 bc99f00..5354185 100644
--- a/admin/layouts/look/details_right.php
+++ b/admin/layouts/look/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 b628769..74f43dd 100644
--- a/admin/layouts/look/details_under.php
+++ b/admin/layouts/look/details_under.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 2dddb86..ee6ec55 100644
--- a/admin/layouts/look/metadata.php
+++ b/admin/layouts/look/metadata.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 e3ef3c5..81cda70 100644
--- a/admin/layouts/look/publishing.php
+++ b/admin/layouts/look/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 6110cd8..a7ae3d5 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			20th March, 2016
+	@build			2nd May, 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 c22da92..9bb022c 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			20th March, 2016
+	@build			2nd May, 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 f5e34d6..d9d7e04 100644
--- a/admin/models/demo.php
+++ b/admin/models/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 abd5a2a..2166e85 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		articles.php
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 29fdd56..8bff83a 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 988d121..6e2006d 100644
--- a/admin/models/forms/look.js
+++ b/admin/models/forms/look.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 9f6e61a..7ce8707 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 78ff0b0..dca49d3 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_documents.php
diff --git a/admin/models/import.php b/admin/models/import.php
index fef4cfc..befb7fe 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		import.php
diff --git a/admin/models/look.php b/admin/models/look.php
index b7823ac..38a969e 100644
--- a/admin/models/look.php
+++ b/admin/models/look.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		look.php
diff --git a/admin/models/looks.php b/admin/models/looks.php
index e40cdaa..c02ab00 100644
--- a/admin/models/looks.php
+++ b/admin/models/looks.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 3af160d..581e434 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help_document.php
diff --git a/admin/tables/look.php b/admin/tables/look.php
index 7e65b53..0eaee26 100644
--- a/admin/tables/look.php
+++ b/admin/tables/look.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 f9b0850..6321ef8 100644
--- a/admin/views/demo/tmpl/default.php
+++ b/admin/views/demo/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 43fc2bb..b8fcbb9 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			20th March, 2016
+	@build			2nd May, 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 5efe831..af669c5 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			20th March, 2016
+	@build			2nd May, 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 3b071b2..dd8c799 100644
--- a/admin/views/demo/view.html.php
+++ b/admin/views/demo/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 1780e61..e9535f3 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 b889888..e68fee1 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			20th March, 2016
+	@build			2nd May, 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 36fa899..a56786e 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			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
@@ -189,7 +189,7 @@ class DemoViewHelp_document extends JViewLegacy
 		$document->setTitle(JText::_($isNew ? 'COM_DEMO_HELP_DOCUMENT_NEW' : 'COM_DEMO_HELP_DOCUMENT_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_demo/assets/css/help_document.css"); 
 		$document->addScript(JURI::root() . $this->script);
-		$document->addScript(JURI::root() . "administrator/components/com_demo/views/help_document/submitbutton.js");
+		$document->addScript(JURI::root() . "administrator/components/com_demo/views/help_document/submitbutton.js"); 
 		JText::script('view not acceptable. Error');
 	}
 }
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index 341f518..2cefeee 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			20th March, 2016
+	@build			2nd May, 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 089701b..3e749c6 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			20th March, 2016
+	@build			2nd May, 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 48486a2..8981f4e 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			20th March, 2016
+	@build			2nd May, 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 7c53e08..786a4af 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			20th March, 2016
+	@build			2nd May, 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 637f961..39e1c12 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			20th March, 2016
+	@build			2nd May, 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 e5cdfd7..bf8e4fc 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			20th March, 2016
+	@build			2nd May, 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 0cd6a09..56ef8b5 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			20th March, 2016
+	@build			2nd May, 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 f1ad303..423ff43 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			20th March, 2016
+	@build			2nd May, 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 b3092a5..c9c26f8 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 4f76ba3..17cc4b7 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 3c61110..cfe7226 100644
--- a/admin/views/look/submitbutton.js
+++ b/admin/views/look/submitbutton.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 6f2e95e..04f489b 100644
--- a/admin/views/look/tmpl/edit.php
+++ b/admin/views/look/tmpl/edit.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 513b707..14393c7 100644
--- a/admin/views/look/view.html.php
+++ b/admin/views/look/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
@@ -189,7 +189,7 @@ class DemoViewLook extends JViewLegacy
 		$document->setTitle(JText::_($isNew ? 'COM_DEMO_LOOK_NEW' : 'COM_DEMO_LOOK_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_demo/assets/css/look.css"); 
 		$document->addScript(JURI::root() . $this->script);
-		$document->addScript(JURI::root() . "administrator/components/com_demo/views/look/submitbutton.js");
+		$document->addScript(JURI::root() . "administrator/components/com_demo/views/look/submitbutton.js"); 
 		JText::script('view not acceptable. Error');
 	}
 }
diff --git a/admin/views/looks/tmpl/default.php b/admin/views/looks/tmpl/default.php
index 3de1cc5..19fd720 100644
--- a/admin/views/looks/tmpl/default.php
+++ b/admin/views/looks/tmpl/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 4d11e04..dc343d6 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			20th March, 2016
+	@build			2nd May, 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 e4d2be1..48656aa 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			20th March, 2016
+	@build			2nd May, 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 2d5bbd9..306f122 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			20th March, 2016
+	@build			2nd May, 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 5ef66ac..67a5afc 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			20th March, 2016
+	@build			2nd May, 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 c4c3be5..b242884 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			20th March, 2016
+	@build			2nd May, 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 496dc84..60d4a88 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			20th March, 2016
+	@build			2nd May, 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 26dc13c..083dc52 100644
--- a/admin/views/looks/view.html.php
+++ b/admin/views/looks/view.html.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		view.html.php
diff --git a/demo.xml b/demo.xml
index cc8c05c..7b56674 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>20th March, 2016</creationDate>
+	<creationDate>2nd May, 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 4ca3342..724ed27 100644
--- a/script.php
+++ b/script.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 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 f0fc4fa..ecfa9be 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		site.css
diff --git a/site/controller.php b/site/controller.php
index 4fca68d..3410bb1 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		controller.php
diff --git a/site/controllers/help.php b/site/controllers/help.php
index 3be18e1..ae6f06f 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		help.php
diff --git a/site/demo.php b/site/demo.php
index 27a0747..1558385 100644
--- a/site/demo.php
+++ b/site/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -27,7 +27,7 @@ $document->addStyleSheet('components/com_demo/assets/css/site.css');
 $document->addScript('components/com_demo/assets/js/site.js');
 
 // Require helper files
-JLoader::register('DemoHelper', dirname(__FILE__) . '/helpers/demo.php');
+JLoader::register('DemoHelper', dirname(__FILE__) . '/helpers/demo.php'); 
 JLoader::register('DemoHelperRoute', dirname(__FILE__) . '/helpers/route.php'); ###SITE_GLOBAL_EVENT###
 
 // import joomla controller library
diff --git a/site/helpers/demo.php b/site/helpers/demo.php
index 88df9ae..b83e520 100644
--- a/site/helpers/demo.php
+++ b/site/helpers/demo.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		demo.php
@@ -396,6 +396,45 @@ abstract class DemoHelper
 		}
 		return false;
 	} 
+
+	public static function isPublished($id,$type)
+	{
+		if ($type == 'raw')
+                {
+			$type = 'item';
+		}
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select(array('a.published'));
+		$query->from('#__demo_'.$type.' AS a');
+		$query->where('a.id = '. (int) $id);
+		$query->where('a.published = 1');
+		$db->setQuery($query);
+		$db->execute();
+		$found = $db->getNumRows();
+		if($found)
+                {
+			return true;
+		}
+		return false;
+	}
+
+	public static function getGroupName($id)
+	{
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select(array('a.title'));
+		$query->from('#__usergroups AS a');
+		$query->where('a.id = '. (int) $id);
+		$db->setQuery($query);
+		$db->execute();
+		$found = $db->getNumRows();
+		if($found)
+                {
+			return $db->loadResult();
+		}
+		return $id;
+	}
 	
 	/**
 	*	Get the actions permissions
@@ -857,7 +896,7 @@ abstract class DemoHelper
 					$w .= ' ';
 					if($r < 100)
 					{
-						$word .= 'and ';
+						$w .= 'and ';
 					}
 					$w .= self::numberToString($r);
 				}
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index b5b57e6..d4d804f 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		headercheck.php
diff --git a/site/helpers/route.php b/site/helpers/route.php
index a47b18a..4d3e590 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		route.php
diff --git a/site/router.php b/site/router.php
index 5dda12a..b275986 100644
--- a/site/router.php
+++ b/site/router.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.5
-	@build			20th March, 2016
+	@build			2nd May, 2016
 	@created		5th August, 2015
 	@package		Demo
 	@subpackage		router.php