diff --git a/README.md b/README.md
index 5b96e453a..ced6e2e9f 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.6.12
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **180462**
++ *Line count*: **180465**
 + *Field count*: **1573**
 + *File count*: **1160**
 + *Folder count*: **186**
diff --git a/admin/README.txt b/admin/README.txt
index 5b96e453a..ced6e2e9f 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -130,7 +130,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.6.12
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **180462**
++ *Line count*: **180465**
 + *Field count*: **1573**
 + *File count*: **1160**
 + *Folder count*: **186**
diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php
index 0bbb4e9cc..c682b59e4 100644
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@@ -440,9 +440,12 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 		$headers->id = 'id';
 		$headers->English = 'English';
 		// add the languages
-		foreach ($languages as $language)
+		if (ComponentbuilderHelper::checkArray($languages))
 		{
-			$headers->{$language} = $language;
+			foreach ($languages as $language)
+			{
+				$headers->{$language} = $language;
+			}
 		}
 		return $headers;
 	} 
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index a8a058e46..93b8a0205 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -91,12 +91,12 @@ JHtml::_('behavior.tooltip');
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'vast_development_method', JText::_('Vast Development Method', true)); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', 'notice_board', JText::_('Notice Board', true)); ?>
 		<div class="row-fluid">
 			<div class="span12">
-				<?php  echo JHtml::_('bootstrap.startAccordion', 'vast_development_method_accordian', array('active' => 'vast_development_method_one')); ?>
-					<?php  echo JHtml::_('bootstrap.addSlide', 'vast_development_method_accordian', 'Notice Board', 'vast_development_method_one'); ?>
-						<?php echo $this->loadTemplate('vast_development_method_notice_board');?>
+				<?php  echo JHtml::_('bootstrap.startAccordion', 'notice_board_accordian', array('active' => 'notice_board_one')); ?>
+					<?php  echo JHtml::_('bootstrap.addSlide', 'notice_board_accordian', 'Vast Development Method', 'notice_board_one'); ?>
+						<?php echo $this->loadTemplate('notice_board_vast_development_method');?>
 					<?php  echo JHtml::_('bootstrap.endSlide'); ?>
 				<?php  echo JHtml::_('bootstrap.endAccordion'); ?>
 			</div>
diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_notice_board_vast_development_method.php
similarity index 95%
rename from admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
rename to admin/views/componentbuilder/tmpl/default_notice_board_vast_development_method.php
index b48d130ce..9c9f76933 100644
--- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
+++ b/admin/views/componentbuilder/tmpl/default_notice_board_vast_development_method.php
@@ -13,7 +13,7 @@
 	@version		2.6.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		default_vast_development_method_notice_board.php
+	@subpackage		default_notice_board_vast_development_method.php
 	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
 	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
 	@copyright		Copyright (C) 2015. All Rights Reserved