diff --git a/app/Controller/BlacklistsController.php b/app/Controller/BlacklistsController.php
index efe12ab58..44a7dc973 100644
--- a/app/Controller/BlacklistsController.php
+++ b/app/Controller/BlacklistsController.php
@@ -10,6 +10,7 @@ App::uses('AppController', 'Controller');
 class BlacklistsController extends AppController {
 
 	public $XXXcomponents = array('Security', 'RequestHandler');
+
 	public $components = array(
 		'Auth' => array(
 			'authorize' => array(
diff --git a/app/Controller/RegexpController.php b/app/Controller/RegexpController.php
index f3b3d9a24..f71720190 100755
--- a/app/Controller/RegexpController.php
+++ b/app/Controller/RegexpController.php
@@ -86,7 +86,6 @@ class RegexpController extends AppController {
 		$this->set('list', Sanitize::clean($this->paginate()));
 	}
 
-
 /**
  *
  */
diff --git a/app/Controller/RolesController.php b/app/Controller/RolesController.php
index e636033df..0f8f4a1a9 100755
--- a/app/Controller/RolesController.php
+++ b/app/Controller/RolesController.php
@@ -40,6 +40,8 @@ class RolesController extends AppController {
  *
  * @param string $id
  * @return void
+ *
+ * @throws NotFoundException
  */
 	public function view($id = null) {
 		$this->Role->id = $id;
diff --git a/app/Controller/WhitelistsController.php b/app/Controller/WhitelistsController.php
index 98f679915..f271fbde8 100755
--- a/app/Controller/WhitelistsController.php
+++ b/app/Controller/WhitelistsController.php
@@ -84,13 +84,14 @@ class WhitelistsController extends AppController {
 		if($this->Auth->User['User']['org'] != 'ADMIN') $this->redirect(array('controller' => 'blaclists', 'action' => 'index', 'admin' => false));
 		$this->AdminCrud->adminDelete($id);
 	}
+
 /**
  * index method
  *
  * @return void
  */
-public function index() {
-	$this->recursive = 0;
-	$this->set('list', Sanitize::clean($this->paginate()));
+	public function index() {
+		$this->recursive = 0;
+		$this->set('list', Sanitize::clean($this->paginate()));
 	}
 }
\ No newline at end of file
diff --git a/app/View/Elements/actions_menu.ctp b/app/View/Elements/actions_menu.ctp
index 61e4b5ab3..74214d82e 100755
--- a/app/View/Elements/actions_menu.ctp
+++ b/app/View/Elements/actions_menu.ctp
@@ -1,76 +1,76 @@
-		<li><?php
-if ($isAclAdd) echo $this->Html->link(__('New Event', true), array('controller' => 'events', 'action' => 'add')); ?></li>
-		<li><?php echo $this->Html->link(__('List Events', true), array('controller' => 'events', 'action' => 'index')); ?></li>
-		<li><?php echo $this->Html->link(__('List Attributes', true), array('controller' => 'attributes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('Search Attributes', true), array('controller' => 'attributes', 'action' => 'search')); ?> </li>
-		<li><?php echo $this->Html->link(__('Export', true), array('controller' => 'events', 'action' => 'export')); ?></li>
-
-		<li>&nbsp;</li>
-		<h3><?php echo __('Global Actions'); ?></h3>
-		<li><?php echo $this->Html->link(__('News', true), array('controller' => 'users', 'action' => 'news')); ?> </li>
-		<li><?php echo $this->Html->link(__('My Profile', true), array('controller' => 'users', 'action' => 'view', 'me')); ?> </li>
-		<li><?php echo $this->Html->link(__('Members List', true), array('controller' => 'users', 'action' => 'memberslist')); ?> </li>
-		<li><?php echo $this->Html->link(__('User Guide', true), array('controller' => 'pages', 'action' => 'display', 'documentation')); ?> </li>
-		<li><?php echo $this->Html->link(__('Terms & Conditions', true), array('controller' => 'users', 'action' => 'terms')); ?> </li>
-		<li><?php echo $this->Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout')); ?> </li>
-
-		<?php
-if (('true' == Configure::read('CyDefSIG.sync')) && ($isAclSync || $isAdmin)): ?>
-		<li>&nbsp;</li>
-		<h3><?php echo __('Sync Actions'); ?></h3>
-		<li><?php echo $this->Html->link(__('List Servers'), array('controller' => 'servers', 'action' => 'index'));?></li>
-        <?php
-endif;?>
-
-
-		<?php
-		//Site admin
-if($isAdmin && $isAclAdmin && $me['org'] == 'ADMIN'): ?>
-		<li>&nbsp;</li>
-		<h3><?php echo __('Administration'); ?></h3>
-		<li><?php echo $this->Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li>&nbsp;</li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('New Role', true), array('controller' => 'roles', 'action' => 'add', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li>&nbsp;</li>
-		<?php
-endif;?>
-
-		<?php
-		//org admin
-if($isAdmin && $isAclAdmin && $me['org'] != 'ADMIN'): ?>
-		<li>&nbsp;</li>
-		<h3><?php echo __('Administration'); ?></h3>
-		<li><?php echo $this->Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?> </li>
-		<li>&nbsp;</li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index')); ?> </li>
-		<li>&nbsp;</li>
-		<?php
-endif;?>
-
-		<?php
-		//normal user
-if(!$isAdmin && !$isAclAdmin): ?>
-		<li>&nbsp;</li>
-		<h3><?php echo __('Lists'); ?></h3>
-		<li><?php echo $this->Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?> </li>
-		<?php
-endif;?>
-
-		<?php
-if($isAdmin || $isAclAudit): ?>
-		<h3><?php echo __('Audit'); ?></h3>
-		<li><?php echo $this->Html->link(__('List Logs', true), array('controller' => 'logs', 'action' => 'index', 'admin' => true)); ?> </li>
-		<li><?php echo $this->Html->link(__('Search Logs', true), array('controller' => 'logs', 'action' => 'admin_search', 'admin' => true)); ?> </li>
-		<?php
+		<li><?php
+if ($isAclAdd) echo $this->Html->link(__('New Event', true), array('controller' => 'events', 'action' => 'add')); ?></li>
+		<li><?php echo $this->Html->link(__('List Events', true), array('controller' => 'events', 'action' => 'index')); ?></li>
+		<li><?php echo $this->Html->link(__('List Attributes', true), array('controller' => 'attributes', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('Search Attributes', true), array('controller' => 'attributes', 'action' => 'search')); ?> </li>
+		<li><?php echo $this->Html->link(__('Export', true), array('controller' => 'events', 'action' => 'export')); ?></li>
+
+		<li>&nbsp;</li>
+		<h3><?php echo __('Global Actions'); ?></h3>
+		<li><?php echo $this->Html->link(__('News', true), array('controller' => 'users', 'action' => 'news')); ?> </li>
+		<li><?php echo $this->Html->link(__('My Profile', true), array('controller' => 'users', 'action' => 'view', 'me')); ?> </li>
+		<li><?php echo $this->Html->link(__('Members List', true), array('controller' => 'users', 'action' => 'memberslist')); ?> </li>
+		<li><?php echo $this->Html->link(__('User Guide', true), array('controller' => 'pages', 'action' => 'display', 'documentation')); ?> </li>
+		<li><?php echo $this->Html->link(__('Terms & Conditions', true), array('controller' => 'users', 'action' => 'terms')); ?> </li>
+		<li><?php echo $this->Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout')); ?> </li>
+
+		<?php
+if (('true' == Configure::read('CyDefSIG.sync')) && ($isAclSync || $isAdmin)): ?>
+		<li>&nbsp;</li>
+		<h3><?php echo __('Sync Actions'); ?></h3>
+		<li><?php echo $this->Html->link(__('List Servers'), array('controller' => 'servers', 'action' => 'index'));?></li>
+        <?php
+endif;?>
+
+
+		<?php
+		//Site admin
+if($isAdmin && $isAclAdmin && $me['org'] == 'ADMIN'): ?>
+		<li>&nbsp;</li>
+		<h3><?php echo __('Administration'); ?></h3>
+		<li><?php echo $this->Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li>&nbsp;</li>
+		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('New Role', true), array('controller' => 'roles', 'action' => 'add', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li>&nbsp;</li>
+		<?php
+endif;?>
+
+		<?php
+		//org admin
+if($isAdmin && $isAclAdmin && $me['org'] != 'ADMIN'): ?>
+		<li>&nbsp;</li>
+		<h3><?php echo __('Administration'); ?></h3>
+		<li><?php echo $this->Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?> </li>
+		<li>&nbsp;</li>
+		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index')); ?> </li>
+		<li>&nbsp;</li>
+		<?php
+endif;?>
+
+		<?php
+		//normal user
+if(!$isAdmin && !$isAclAdmin): ?>
+		<li>&nbsp;</li>
+		<h3><?php echo __('Lists'); ?></h3>
+		<li><?php echo $this->Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?> </li>
+		<?php
+endif;?>
+
+		<?php
+if($isAdmin || $isAclAudit): ?>
+		<h3><?php echo __('Audit'); ?></h3>
+		<li><?php echo $this->Html->link(__('List Logs', true), array('controller' => 'logs', 'action' => 'index', 'admin' => true)); ?> </li>
+		<li><?php echo $this->Html->link(__('Search Logs', true), array('controller' => 'logs', 'action' => 'admin_search', 'admin' => true)); ?> </li>
+		<?php
 endif;
\ No newline at end of file
diff --git a/app/View/Logs/admin_search.ctp b/app/View/Logs/admin_search.ctp
index 4ce8f9678..a77f27c8a 100755
--- a/app/View/Logs/admin_search.ctp
+++ b/app/View/Logs/admin_search.ctp
@@ -1,54 +1,54 @@
-<div class="logs form">
-<?php echo $this->Form->create('Log');?>
-	<fieldset>
-		<legend><?php echo __('Search Log'); ?></legend>
-	<?php
-		echo $this->Form->input('email', array( 'label' => 'Email'));
-		if ($orgRestriction == false) {
-			echo $this->Form->input('org', array( 'label' => 'Org'));
-		}
-		echo $this->Form->input('action', array('between' => $this->Html->div('forminfo', '', array('id' => 'LogActionDiv'))));
-		echo $this->Form->input('title', array( 'label' => 'Title'));
-		echo $this->Form->input('change', array( 'label' => 'Change'));
-	?>
-	</fieldset>
-<?php echo $this->Form->end(__('Search', true));?>
-</div>
-<div class="actions">
-	<ul>
-        <?php echo $this->element('actions_menu'); ?>
-	</ul>
-</div>
-<script type="text/javascript">
-
-var formInfoValues = new Array();
-<?php
-
-foreach ($actionDefinitions as $action => $def) {
-	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
-	echo "formInfoValues['$action'] = \"$info\";\n";
-}
-
-	$this->Js->get('#LogAction')->event('change', 'showFormInfo("#LogAction")');
-
-?>
-
-formInfoValues['ALL'] = '';
-
-function showFormInfo(id) {
-	idDiv = id+'Div';
-	// LATER use nice animations
-	//$(idDiv).hide('fast');
-	// change the content
-	var value = $(id).val();    // get the selected value
-	$(idDiv).html(formInfoValues[value]);    // search in a lookup table
-
-	// show it again
-	$(idDiv).fadeIn('slow');
-}
-
-// hide the formInfo things
-$('#LogActionDiv').hide();
-
-</script>
+<div class="logs form">
+<?php echo $this->Form->create('Log');?>
+	<fieldset>
+		<legend><?php echo __('Search Log'); ?></legend>
+	<?php
+		echo $this->Form->input('email', array( 'label' => 'Email'));
+		if ($orgRestriction == false) {
+			echo $this->Form->input('org', array( 'label' => 'Org'));
+		}
+		echo $this->Form->input('action', array('between' => $this->Html->div('forminfo', '', array('id' => 'LogActionDiv'))));
+		echo $this->Form->input('title', array( 'label' => 'Title'));
+		echo $this->Form->input('change', array( 'label' => 'Change'));
+	?>
+	</fieldset>
+<?php echo $this->Form->end(__('Search', true));?>
+</div>
+<div class="actions">
+	<ul>
+        <?php echo $this->element('actions_menu'); ?>
+	</ul>
+</div>
+<script type="text/javascript">
+
+var formInfoValues = new Array();
+<?php
+
+foreach ($actionDefinitions as $action => $def) {
+	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
+	echo "formInfoValues['$action'] = \"$info\";\n";
+}
+
+	$this->Js->get('#LogAction')->event('change', 'showFormInfo("#LogAction")');
+
+?>
+
+formInfoValues['ALL'] = '';
+
+function showFormInfo(id) {
+	idDiv = id+'Div';
+	// LATER use nice animations
+	//$(idDiv).hide('fast');
+	// change the content
+	var value = $(id).val();    // get the selected value
+	$(idDiv).html(formInfoValues[value]);    // search in a lookup table
+
+	// show it again
+	$(idDiv).fadeIn('slow');
+}
+
+// hide the formInfo things
+$('#LogActionDiv').hide();
+
+</script>
 <?php echo $this->Js->writeBuffer();
\ No newline at end of file