diff --git a/code/Admin/ModuleManager.php b/code/Admin/ModuleManager.php
index 89a6ffc..7cb6045 100644
--- a/code/Admin/ModuleManager.php
+++ b/code/Admin/ModuleManager.php
@@ -1,38 +1,44 @@
-<?php
-
-class ModuleManager extends DataObject {
-
-	public function getCMSFields() {
-		$fields = FieldList::create( $tabSet = TabSet::create('Root'));		
-		return $fields;
-	}
-	
-	public function setRequest($req){
-		return false;
-	}
-	
-	public function requireDefaultRecords() {
-		parent::requireDefaultRecords();
-		$moduleManager = ModuleManager::get()->First();
-		if(!$moduleManager) {
-			self::make_module_manager();
-			DB::alteration_message("Added default module manager","created");
-		}
-	}
-	
-	static public function make_module_manager() {
-		$moduleManager = ModuleManager::create();
-		$moduleManager->write();
-		return $moduleManager;
-	}
-	
-	public static function CurrentModuleManager(){		
-		$current = ModuleManager::get()->First();		
-		return $current;
-	}
-	
-	public function CMSEditLink() {
-		return singleton('ModuleManagerController')->Link();
-	}
-
-}
+<?php
+
+class ModuleManager extends DataObject
+{
+
+    public function getCMSFields()
+    {
+        $fields = FieldList::create($tabSet = TabSet::create('Root'));
+        return $fields;
+    }
+    
+    public function setRequest($req)
+    {
+        return false;
+    }
+    
+    public function requireDefaultRecords()
+    {
+        parent::requireDefaultRecords();
+        $moduleManager = ModuleManager::get()->First();
+        if (!$moduleManager) {
+            self::make_module_manager();
+            DB::alteration_message("Added default module manager", "created");
+        }
+    }
+    
+    public static function make_module_manager()
+    {
+        $moduleManager = ModuleManager::create();
+        $moduleManager->write();
+        return $moduleManager;
+    }
+    
+    public static function CurrentModuleManager()
+    {
+        $current = ModuleManager::get()->First();
+        return $current;
+    }
+    
+    public function CMSEditLink()
+    {
+        return singleton('ModuleManagerController')->Link();
+    }
+}
diff --git a/code/Admin/ModuleManagerController.php b/code/Admin/ModuleManagerController.php
index 064f7c2..f80546b 100644
--- a/code/Admin/ModuleManagerController.php
+++ b/code/Admin/ModuleManagerController.php
@@ -1,104 +1,116 @@
-<?php
-class ModuleManagerController extends LeftAndMain {
-
-	static $url_segment = 'module-manager';
-	static $url_rule = '/$Action/$ID/$OtherID';
-	static $menu_priority = -1;
-	static $url_priority = 40;
-	static $menu_title = 'Module Manager';
-	static $tree_class = 'ModuleManager';
-	static $menu_icon = 'module-manager/images/cms-icon.png';
-	
-	public function init() {
-		parent::init();
-		Requirements::javascript(CMS_DIR . '/javascript/CMSMain.EditForm.js');
-	}
-
-	public function getResponseNegotiator() {
-		$neg = parent::getResponseNegotiator();
-		$controller = $this;
-		$neg->setCallback('CurrentForm', function() use(&$controller) {
-			return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
-		});
-		return $neg;
-	}
-	
-	public function getEditForm($id = null, $fields = null) {
-		
-		// get the cmsfields from ModuleManager DataObject
-		$moduleManager = ModuleManager::CurrentModuleManager();
-		$fields = $moduleManager->getCMSFields();
-		
-		// what pages is this module active on
-		$modulesGridField = GridField::create(
-				"Modules_Gridfield", 
-				"Modules", 
-				Module::get(), 
-				$modulesGridFieldConfig = GridFieldConfig_RecordEditor::create()
-			);
-		$modulePositionsGridField = GridField::create(
-				"ModulePositions_Gridfield", 
-				"Module Positions", 
-				ModulePosition::get(), 
-				GridFieldConfig_RecordEditor::create()
-			);
-		
-		// add multiclass dropdown for modules
-		$modulesGridFieldConfig->removeComponentsByType('GridFieldAddNewButton');
-		$modulesGridFieldConfig->addComponent(new GridFieldAddNewMultiClass());
-		
-		// add the fields
-		$fields->addFieldToTab('Root.Modules', $modulesGridField);
-		$fields->addFieldToTab('Root.ModulePositions', $modulePositionsGridField);
-		$fields->addFieldToTab('Root.ModulePositions', LiteralField::create('html','<em>To load a position into your template, simply write <code>$ModulePosition(Alias)</code> where <code>Alias</code> is your position alias</em>'));
-		
-		// actions
-		$actions = $moduleManager->getCMSActions();
-		$form = CMSForm::create( 
-			$this, 'EditForm', $fields, $actions
-		)->setHTMLID('Form_EditForm');
-		$form->setResponseNegotiator($this->getResponseNegotiator());
-		$form->addExtraClass('cms-content center cms-edit-form');
-		// don't add data-pjax-fragment=CurrentForm, its added in the content template instead
-
-		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
-		$form->setHTMLID('Form_EditForm');
-		$form->loadDataFrom($moduleManager);
-		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-
-		// Use <button> to allow full jQuery UI styling
-		$actions = $actions->dataFields();
-		if($actions) foreach($actions as $action) $action->setUseButtonTag(true);
-
-		return $form;
-	}
-	
-	public function getSilverStripeNavigator() {
-		return $this->renderWith('CMSSettingsController_SilverStripeNavigator');
-	}
-	
-	public function Breadcrumbs($unlinked = false) {
-		$defaultTitle = self::menu_title_for_class(get_class($this));
-		return new ArrayList(array(
-			new ArrayData(array(
-				'Title' => _t("{$this->class}.MENUTITLE", $defaultTitle),
-				'Link' => false
-			))
-		));
-	}	
-	
-	// builds a list of all the module types (classes that extend Module)
-	public function ModuleTypes() {
-		$moduleTypes = array();
-		$modules = Module::get();
-		foreach( $modules as $module ){
-			$moduleTypes[$module->ClassName] = array(
-					'ClassName' => $module->ClassName,
-					'Name' => $module->ModuleName(),
-					'Description' => $module->ModuleDescription()
-				);
-		}
-		return $moduleTypes;
-	}
-	
-}
+<?php
+class ModuleManagerController extends LeftAndMain
+{
+
+    public static $url_segment = 'module-manager';
+    public static $url_rule = '/$Action/$ID/$OtherID';
+    public static $menu_priority = -1;
+    public static $url_priority = 40;
+    public static $menu_title = 'Module Manager';
+    public static $tree_class = 'ModuleManager';
+    public static $menu_icon = 'module-manager/images/cms-icon.png';
+    
+    public function init()
+    {
+        parent::init();
+        Requirements::javascript(CMS_DIR . '/javascript/CMSMain.EditForm.js');
+    }
+
+    public function getResponseNegotiator()
+    {
+        $neg = parent::getResponseNegotiator();
+        $controller = $this;
+        $neg->setCallback('CurrentForm', function () use (&$controller) {
+            return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
+        });
+        return $neg;
+    }
+    
+    public function getEditForm($id = null, $fields = null)
+    {
+        
+        // get the cmsfields from ModuleManager DataObject
+        $moduleManager = ModuleManager::CurrentModuleManager();
+        $fields = $moduleManager->getCMSFields();
+        
+        // what pages is this module active on
+        $modulesGridField = GridField::create(
+                "Modules_Gridfield",
+                "Modules",
+                Module::get(),
+                $modulesGridFieldConfig = GridFieldConfig_RecordEditor::create()
+            );
+        $modulePositionsGridField = GridField::create(
+                "ModulePositions_Gridfield",
+                "Module Positions",
+                ModulePosition::get(),
+                GridFieldConfig_RecordEditor::create()
+            );
+        
+        // add multiclass dropdown for modules
+        $modulesGridFieldConfig->removeComponentsByType('GridFieldAddNewButton');
+        $modulesGridFieldConfig->addComponent(new GridFieldAddNewMultiClass());
+        
+        // add the fields
+        $fields->addFieldToTab('Root.Modules', $modulesGridField);
+        $fields->addFieldToTab('Root.ModulePositions', $modulePositionsGridField);
+        $fields->addFieldToTab('Root.ModulePositions', LiteralField::create('html', '<em>To load a position into your template, simply write <code>$ModulePosition(Alias)</code> where <code>Alias</code> is your position alias</em>'));
+        
+        // actions
+        $actions = $moduleManager->getCMSActions();
+        $form = CMSForm::create(
+            $this, 'EditForm', $fields, $actions
+        )->setHTMLID('Form_EditForm');
+        $form->setResponseNegotiator($this->getResponseNegotiator());
+        $form->addExtraClass('cms-content center cms-edit-form');
+        // don't add data-pjax-fragment=CurrentForm, its added in the content template instead
+
+        if ($form->Fields()->hasTabset()) {
+            $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+        }
+        $form->setHTMLID('Form_EditForm');
+        $form->loadDataFrom($moduleManager);
+        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+
+        // Use <button> to allow full jQuery UI styling
+        $actions = $actions->dataFields();
+        if ($actions) {
+            foreach ($actions as $action) {
+                $action->setUseButtonTag(true);
+            }
+        }
+
+        return $form;
+    }
+    
+    public function getSilverStripeNavigator()
+    {
+        return $this->renderWith('CMSSettingsController_SilverStripeNavigator');
+    }
+    
+    public function Breadcrumbs($unlinked = false)
+    {
+        $defaultTitle = self::menu_title_for_class(get_class($this));
+        return new ArrayList(array(
+            new ArrayData(array(
+                'Title' => _t("{$this->class}.MENUTITLE", $defaultTitle),
+                'Link' => false
+            ))
+        ));
+    }
+    
+    // builds a list of all the module types (classes that extend Module)
+    public function ModuleTypes()
+    {
+        $moduleTypes = array();
+        $modules = Module::get();
+        foreach ($modules as $module) {
+            $moduleTypes[$module->ClassName] = array(
+                    'ClassName' => $module->ClassName,
+                    'Name' => $module->ModuleName(),
+                    'Description' => $module->ModuleDescription()
+                );
+        }
+        return $moduleTypes;
+    }
+}
diff --git a/code/DataObjects/Module.php b/code/DataObjects/Module.php
index f4a192f..dad1cdf 100644
--- a/code/DataObjects/Module.php
+++ b/code/DataObjects/Module.php
@@ -1,162 +1,166 @@
-<?php
-/**
- * @package modulemanager
- */
-class Module extends DataObject {
-	
-	// set object parameters
-	static $db = array(
-		'Title'       		=> 'Varchar(128)',
-		'Alias' 			=> 'Text'
-	);
-	
-	// set module names
-	static $singular_name = 'Module';
-	static $plural_name = 'Modules';
-	static $description = 'Standard Module';
-	
-	static $has_one = array(
-		'Position' => 'ModulePosition'
-	);
-	
-	static $many_many = array(
-		'Pages' => 'SiteTree'
-	);
-	
-	static $summary_fields = array(
-		'ModuleName' => 'Type',
-		'Title' => 'Title',
-		'Position.Title' => 'Position',
-		'Pages.Count' => 'Page usage'
-	);
-	
-	// returns name of this module type (uses static $singular_name)
-	public function ModuleName(){
-		$object = new ReflectionClass($this->ClassName);
-		$properties = $object->getStaticProperties();
-		return $properties['singular_name'];
-	}
-	
-	// returns name of this module type (uses static $description)
-	public function ModuleDescription(){
-		$object = new ReflectionClass($this->ClassName);
-		$properties = $object->getStaticProperties();
-		return $properties['description'];
-	}
-	
-	static $searchable_fields = array(
-		'Title',
-		'PositionID'
-	);
-   
-	// create cms fields
-	public function getCMSFields() {
-		
-		$fields = new FieldList(new TabSet('Root'));
-		
-		// required information
-		$fields->addFieldToTab('Root.Main', new HiddenField('ModuleID', 'ModuleID', $this->ID));		
-		$fields->addFieldToTab('Root.Main', new ReadonlyField('Type', 'Module Type', $this->ModuleName()));		
-		$fields->addFieldToTab('Root.Main', new TextField('Title', 'Title'));
-		$fields->addFieldToTab('Root.Main', new TextField('Alias', 'Alias (unique identifier)'));
-		$fields->addFieldToTab('Root.Main', new DropdownField(
-				'PositionID',
-				'Position',
-				$this->GetModulePositions()
-			));
-		
-		// what pages is this module active on
-		$gridFieldConfig = GridFieldConfig_RelationEditor::create();
-		$gridField = new GridField("Pages", "Pages", $this->Pages(), $gridFieldConfig);
-		$fields->addFieldToTab("Root.Pages", $gridField);
-		
-		return $fields;
-	}
-	
-	// return list of possible module positions for cms dropdown field
-	function GetModulePositions(){
-	
-		if($Positions = DataObject::get('ModulePosition')){
-			
-			// construct container
-			$map = array();
-			
-			// loop each position and inject into map
-			foreach( $Positions as $Position ){
-				$map[$Position->ID] = $Position->Title .' ('.$Position->Alias.')';
-			}
-			
-			return $map;
-		}else{
-			return array('You need to create a Module Position first');
-		}
-	}
-	
-	// return list of possible module positions for cms dropdown field
-	function ModulePositionName(){
-		
-		$position = ModulePosition::get()->byID($this->ModulePosition);
-		return $position->Title;
-	}
-	
-	// produce the html markup using templates, for the holder template
-	public function ModuleLayout(){
-		
-		// try rendering with this module's own template
-		$output = $this->renderWith($this->ClassName);
-		
-		// no custom template, so use base template (Model.ss)
-		//if( !$output )
-			//$output = $this->renderWith('Module');
-			// TODO: Make this work. To make it work we actually need to properly check if we have a custom template for this class.
-		
-		return $output;
-	}
-	
-	// convert string into url-friendly string
-	public function URLFriendly( $string ){
-	
-		// replace non letter or digits by -
-		$string = preg_replace('~[^\\pL\d]+~u', '-', $string);
-		$string = trim($string, '-');
-
-		// transliterate
-		$string = iconv('utf-8', 'us-ascii//TRANSLIT', $string);
-
-		// lowercase
-		$string = strtolower($string);
-
-		// remove unwanted characters
-		$string = preg_replace('~[^-\w]+~', '', $string);
-
-		if (empty($string))
-			return 'n-a';
-
-		return $string;
-	}
-	
-	// before saving, check alias
-	public function onBeforeWrite(){
-	
-		parent::onBeforeWrite();
-		
-		// convert name to lowercase, dashed
-		$newAlias = $this->URLFriendly($this->Title);
-		
-		// get positions that already have this alias
-		$moduleAliasesThatMatch = ModulePosition::get()->Filter('Alias',$newAlias)->First();
-		
-		// if we find a match
-		if( isset($moduleAliasesThatMatch->ID) ){
-			
-			// create a new unique alias (based on ID)
-			$this->Alias = $newAlias .'-'. $this->ID;
-		
-		// no match, meaning we're safe to use this as a unique alias
-		}else{			
-			$this->Alias = $newAlias;
-		}
-		
-	}
-	
-}
+<?php
+/**
+ * @package modulemanager
+ */
+class Module extends DataObject
+{
+    
+    // set object parameters
+    public static $db = array(
+        'Title'               => 'Varchar(128)',
+        'Alias'            => 'Text'
+    );
+    
+    // set module names
+    public static $singular_name = 'Module';
+    public static $plural_name = 'Modules';
+    public static $description = 'Standard Module';
+    
+    public static $has_one = array(
+        'Position' => 'ModulePosition'
+    );
+    
+    public static $many_many = array(
+        'Pages' => 'SiteTree'
+    );
+    
+    public static $summary_fields = array(
+        'ModuleName' => 'Type',
+        'Title' => 'Title',
+        'Position.Title' => 'Position',
+        'Pages.Count' => 'Page usage'
+    );
+    
+    // returns name of this module type (uses static $singular_name)
+    public function ModuleName()
+    {
+        $object = new ReflectionClass($this->ClassName);
+        $properties = $object->getStaticProperties();
+        return $properties['singular_name'];
+    }
+    
+    // returns name of this module type (uses static $description)
+    public function ModuleDescription()
+    {
+        $object = new ReflectionClass($this->ClassName);
+        $properties = $object->getStaticProperties();
+        return $properties['description'];
+    }
+    
+    public static $searchable_fields = array(
+        'Title',
+        'PositionID'
+    );
+   
+    // create cms fields
+    public function getCMSFields()
+    {
+        $fields = new FieldList(new TabSet('Root'));
+        
+        // required information
+        $fields->addFieldToTab('Root.Main', new HiddenField('ModuleID', 'ModuleID', $this->ID));
+        $fields->addFieldToTab('Root.Main', new ReadonlyField('Type', 'Module Type', $this->ModuleName()));
+        $fields->addFieldToTab('Root.Main', new TextField('Title', 'Title'));
+        $fields->addFieldToTab('Root.Main', new TextField('Alias', 'Alias (unique identifier)'));
+        $fields->addFieldToTab('Root.Main', new DropdownField(
+                'PositionID',
+                'Position',
+                $this->GetModulePositions()
+            ));
+        
+        // what pages is this module active on
+        $gridFieldConfig = GridFieldConfig_RelationEditor::create();
+        $gridField = new GridField("Pages", "Pages", $this->Pages(), $gridFieldConfig);
+        $fields->addFieldToTab("Root.Pages", $gridField);
+        
+        return $fields;
+    }
+    
+    // return list of possible module positions for cms dropdown field
+    public function GetModulePositions()
+    {
+        if ($Positions = DataObject::get('ModulePosition')) {
+            
+            // construct container
+            $map = array();
+            
+            // loop each position and inject into map
+            foreach ($Positions as $Position) {
+                $map[$Position->ID] = $Position->Title .' ('.$Position->Alias.')';
+            }
+            
+            return $map;
+        } else {
+            return array('You need to create a Module Position first');
+        }
+    }
+    
+    // return list of possible module positions for cms dropdown field
+    public function ModulePositionName()
+    {
+        $position = ModulePosition::get()->byID($this->ModulePosition);
+        return $position->Title;
+    }
+    
+    // produce the html markup using templates, for the holder template
+    public function ModuleLayout()
+    {
+        
+        // try rendering with this module's own template
+        $output = $this->renderWith($this->ClassName);
+        
+        // no custom template, so use base template (Model.ss)
+        //if( !$output )
+            //$output = $this->renderWith('Module');
+            // TODO: Make this work. To make it work we actually need to properly check if we have a custom template for this class.
+
+        return $output;
+    }
+    
+    // convert string into url-friendly string
+    public function URLFriendly($string)
+    {
+    
+        // replace non letter or digits by -
+        $string = preg_replace('~[^\\pL\d]+~u', '-', $string);
+        $string = trim($string, '-');
+
+        // transliterate
+        $string = iconv('utf-8', 'us-ascii//TRANSLIT', $string);
+
+        // lowercase
+        $string = strtolower($string);
+
+        // remove unwanted characters
+        $string = preg_replace('~[^-\w]+~', '', $string);
+
+        if (empty($string)) {
+            return 'n-a';
+        }
+
+        return $string;
+    }
+    
+    // before saving, check alias
+    public function onBeforeWrite()
+    {
+        parent::onBeforeWrite();
+        
+        // convert name to lowercase, dashed
+        $newAlias = $this->URLFriendly($this->Title);
+        
+        // get positions that already have this alias
+        $moduleAliasesThatMatch = ModulePosition::get()->Filter('Alias', $newAlias)->First();
+        
+        // if we find a match
+        if (isset($moduleAliasesThatMatch->ID)) {
+            
+            // create a new unique alias (based on ID)
+            $this->Alias = $newAlias .'-'. $this->ID;
+        
+        // no match, meaning we're safe to use this as a unique alias
+        } else {
+            $this->Alias = $newAlias;
+        }
+    }
+}
diff --git a/code/DataObjects/ModulePosition.php b/code/DataObjects/ModulePosition.php
index b1100da..e1ed8ca 100644
--- a/code/DataObjects/ModulePosition.php
+++ b/code/DataObjects/ModulePosition.php
@@ -1,87 +1,90 @@
-<?php
-/**
- * @package modulemanager
- */
-class ModulePosition extends DataObject {
-	
-	// object paramaters
-	public static $db = array(
-		'Name'       	=> 'Text',
-		'Alias'       	=> 'Text'
-	);
-
-	// set object icon
-	public static $icon = 'modulemanager/images/definition.png';
-	
-	// set gridfield columns
-	public static $summary_fields = array(
-		'Title' => 'Title',
-		'Alias' => 'Alias',
-		'ModulesCount' => '# of Modules'
-	);
-	
-	public function ModulesCount(){
-		$modules = Module::get()->Filter('PositionID', $this->ID);
-		if( !$modules )
-			return 0;
-		return $modules->Count();
-	}
-	
-	// create cms fields
-	public function getCMSFields() {
-		
-		$fields = new FieldList(new TabSet('Root'));
-
-		$fields->addFieldToTab('Root.Main', new TextField('Name', 'Name'));
-		$fields->addFieldToTab('Root.Main', new TextField('Alias', 'Alias (Unique reference)'));
-
-		return $fields;
-	}
-	
-	// convert string into url-friendly string
-	public function URLFriendly( $string ){
-	
-		// replace non letter or digits by -
-		$string = preg_replace('~[^\\pL\d]+~u', '-', $string);
-		$string = trim($string, '-');
-
-		// transliterate
-		$string = iconv('utf-8', 'us-ascii//TRANSLIT', $string);
-
-		// lowercase
-		$string = strtolower($string);
-
-		// remove unwanted characters
-		$string = preg_replace('~[^-\w]+~', '', $string);
-
-		if (empty($string))
-			return 'n-a';
-
-		return $string;
-	}
-	
-	// before saving, check alias
-	public function onBeforeWrite(){
-	
-		parent::onBeforeWrite();
-		
-		// convert name to lowercase, dashed
-		$newAlias = $this->URLFriendly($this->Title);
-		
-		// get positions that already have this alias
-		$positionsThatMatch = ModulePosition::get()->Filter('Alias',$newAlias)->First();
-		
-		// if we find a match
-		if( isset($positionsThatMatch->ID) ){
-			
-			// create a new unique alias (based on ID)
-			$this->Alias = $newAlias .'-'. $this->ID;
-		
-		// no match, meaning we're safe to use this as a unique alias
-		}else{			
-			$this->Alias = $newAlias;
-		}
-		
-	}
-	
-}
+<?php
+/**
+ * @package modulemanager
+ */
+class ModulePosition extends DataObject
+{
+    
+    // object paramaters
+    public static $db = array(
+        'Name'           => 'Text',
+        'Alias'           => 'Text'
+    );
+
+    // set object icon
+    public static $icon = 'modulemanager/images/definition.png';
+    
+    // set gridfield columns
+    public static $summary_fields = array(
+        'Title' => 'Title',
+        'Alias' => 'Alias',
+        'ModulesCount' => '# of Modules'
+    );
+    
+    public function ModulesCount()
+    {
+        $modules = Module::get()->Filter('PositionID', $this->ID);
+        if (!$modules) {
+            return 0;
+        }
+        return $modules->Count();
+    }
+    
+    // create cms fields
+    public function getCMSFields()
+    {
+        $fields = new FieldList(new TabSet('Root'));
+
+        $fields->addFieldToTab('Root.Main', new TextField('Name', 'Name'));
+        $fields->addFieldToTab('Root.Main', new TextField('Alias', 'Alias (Unique reference)'));
+
+        return $fields;
+    }
+    
+    // convert string into url-friendly string
+    public function URLFriendly($string)
+    {
+    
+        // replace non letter or digits by -
+        $string = preg_replace('~[^\\pL\d]+~u', '-', $string);
+        $string = trim($string, '-');
+
+        // transliterate
+        $string = iconv('utf-8', 'us-ascii//TRANSLIT', $string);
+
+        // lowercase
+        $string = strtolower($string);
+
+        // remove unwanted characters
+        $string = preg_replace('~[^-\w]+~', '', $string);
+
+        if (empty($string)) {
+            return 'n-a';
+        }
+
+        return $string;
+    }
+    
+    // before saving, check alias
+    public function onBeforeWrite()
+    {
+        parent::onBeforeWrite();
+        
+        // convert name to lowercase, dashed
+        $newAlias = $this->URLFriendly($this->Title);
+        
+        // get positions that already have this alias
+        $positionsThatMatch = ModulePosition::get()->Filter('Alias', $newAlias)->First();
+        
+        // if we find a match
+        if (isset($positionsThatMatch->ID)) {
+            
+            // create a new unique alias (based on ID)
+            $this->Alias = $newAlias .'-'. $this->ID;
+        
+        // no match, meaning we're safe to use this as a unique alias
+        } else {
+            $this->Alias = $newAlias;
+        }
+    }
+}
diff --git a/code/Extensions/ModuleSiteTreeExtension.php b/code/Extensions/ModuleSiteTreeExtension.php
index ed4fe9a..8c0593f 100644
--- a/code/Extensions/ModuleSiteTreeExtension.php
+++ b/code/Extensions/ModuleSiteTreeExtension.php
@@ -1,104 +1,114 @@
-<?php
-/**
- * @package modulemanager
- */
-class ModuleSiteTreeExtension extends DataExtension {
-	
-	// set object parameters
-	public static $db = array(
-		'InheritModules' => 'Boolean'
-	);
-	
-	// set object parameters
-	public static $defaults = array(
-		'InheritModules' => 1
-	);
-	
-	// set object parameters
-	public static $belongs_many_many = array(
-		'Modules' => 'Module'
-	);
-   
-	// create cms fields
-	public function updateCMSFields(FieldList $fields) {	
-		
-		// create gridfield management for the many_many relationship
-		$gridFieldConfig = GridFieldConfig_RelationEditor::create();
-		
-		// create the gridfield itself
-		$gridField = GridField::create("Modules", "Modules", $this->PageModules(), $gridFieldConfig);
-		
-		// add multiclass dropdown for modules
-		$gridFieldConfig->removeComponentsByType('GridFieldAddNewButton');
-		$gridFieldConfig->addComponent(new GridFieldAddNewMultiClass());
-		
-		// add to fields
-		$fields->addFieldToTab("Root.Modules", CheckboxField::create('InheritModules','Inherit modules from parent'));
-		$fields->addFieldToTab("Root.Modules", $gridField);
-		
-		return $fields;
-		
-	}
-	
-	// get my parent page
-	public function MyParentPage($page){
-		return $page->parent;
-	}
-	
-	
-	// build list of all Modules attached to this page
-	public function PageModules(){
-		
-		$page = $this->owner;
-		
-		// check for inheritance by recursively searching
-		while( $page->InheritModules && $page->ParentID > 0 )
-			$page = $this->MyParentPage( $page );
-		
-		$modules = $page->getManyManyComponents('Modules');
-			
-		return $modules;
-	}	
-
-	// return all modules of the specified module area
-	// called in template with $ModuleArea(module-alias)
-	function ModulePosition($alias){
-		
-		// create container for output code
-		$output = '';
-		
-		// get the module area as an object
-		$position = ModulePosition::get()->filter('Alias', $alias)->First();
-		
-		if( !isset($position->ID) ) user_error("Cannot find a Module Position by that name (".$alias."). Check your template is calling a ModulePosition by an alias that exists!",E_USER_ERROR);
-		
-		// get this page's module list for specified position
-		$modules = $this->PageModules()->Filter('PositionID',$position->ID);		
-		
-		// store them in a template array (for template loop)
-		$items = array(
-			'Position' => $position,
-			'Items' => $modules
-		);
-		
-		return $this->owner->customise($items)->renderWith('ModuleHolder');
-	}
-	
-	// returns switch if position contains any modules for this page
-	function ActiveModulePosition($alias){
-		
-		// get the module area as an object
-		$position = ModulePosition::get()->filter('Alias', $alias)->First();
-		
-		if( !isset($position->ID) ) user_error("Cannot find a Module Position by that name (".$alias."). Check your template is calling a ModulePosition by an alias that exists!",E_USER_ERROR);
-		
-		// get this page's module list for specified position
-		$modules = $this->PageModules()->Filter('PositionID',$position->ID);
-		
-		// if there are any modules in this area
-		if( $modules->Count() > 0 )
-			return true;
-			
-		return false;		
-	}
-}
+<?php
+/**
+ * @package modulemanager
+ */
+class ModuleSiteTreeExtension extends DataExtension
+{
+    
+    // set object parameters
+    public static $db = array(
+        'InheritModules' => 'Boolean'
+    );
+    
+    // set object parameters
+    public static $defaults = array(
+        'InheritModules' => 1
+    );
+    
+    // set object parameters
+    public static $belongs_many_many = array(
+        'Modules' => 'Module'
+    );
+   
+    // create cms fields
+    public function updateCMSFields(FieldList $fields)
+    {
+        
+        // create gridfield management for the many_many relationship
+        $gridFieldConfig = GridFieldConfig_RelationEditor::create();
+        
+        // create the gridfield itself
+        $gridField = GridField::create("Modules", "Modules", $this->PageModules(), $gridFieldConfig);
+        
+        // add multiclass dropdown for modules
+        $gridFieldConfig->removeComponentsByType('GridFieldAddNewButton');
+        $gridFieldConfig->addComponent(new GridFieldAddNewMultiClass());
+        
+        // add to fields
+        $fields->addFieldToTab("Root.Modules", CheckboxField::create('InheritModules', 'Inherit modules from parent'));
+        $fields->addFieldToTab("Root.Modules", $gridField);
+        
+        return $fields;
+    }
+    
+    // get my parent page
+    public function MyParentPage($page)
+    {
+        return $page->parent;
+    }
+    
+    
+    // build list of all Modules attached to this page
+    public function PageModules()
+    {
+        $page = $this->owner;
+        
+        // check for inheritance by recursively searching
+        while ($page->InheritModules && $page->ParentID > 0) {
+            $page = $this->MyParentPage($page);
+        }
+        
+        $modules = $page->getManyManyComponents('Modules');
+            
+        return $modules;
+    }
+
+    // return all modules of the specified module area
+    // called in template with $ModuleArea(module-alias)
+    public function ModulePosition($alias)
+    {
+        
+        // create container for output code
+        $output = '';
+        
+        // get the module area as an object
+        $position = ModulePosition::get()->filter('Alias', $alias)->First();
+        
+        if (!isset($position->ID)) {
+            user_error("Cannot find a Module Position by that name (".$alias."). Check your template is calling a ModulePosition by an alias that exists!", E_USER_ERROR);
+        }
+        
+        // get this page's module list for specified position
+        $modules = $this->PageModules()->Filter('PositionID', $position->ID);
+        
+        // store them in a template array (for template loop)
+        $items = array(
+            'Position' => $position,
+            'Items' => $modules
+        );
+        
+        return $this->owner->customise($items)->renderWith('ModuleHolder');
+    }
+    
+    // returns switch if position contains any modules for this page
+    public function ActiveModulePosition($alias)
+    {
+        
+        // get the module area as an object
+        $position = ModulePosition::get()->filter('Alias', $alias)->First();
+        
+        if (!isset($position->ID)) {
+            user_error("Cannot find a Module Position by that name (".$alias."). Check your template is calling a ModulePosition by an alias that exists!", E_USER_ERROR);
+        }
+        
+        // get this page's module list for specified position
+        $modules = $this->PageModules()->Filter('PositionID', $position->ID);
+        
+        // if there are any modules in this area
+        if ($modules->Count() > 0) {
+            return true;
+        }
+            
+        return false;
+    }
+}