diff --git a/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl b/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
index 0f7e208ac..174ee0639 100644
--- a/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
+++ b/code/web/private_php/ams/plugins/Domain_Management/templates/index.tpl
@@ -1,211 +1,213 @@
 {block name=content}
 
-{if isset($smarty.get.edit_domain)}
-<div class="row-fluid sortable ui-sortable">
-    <div class="box col-md-9">
-	<div class="box-inner">
-        <div class="box-header well" data-original-title="">
-            <h2><i class="icon-list"></i> {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_name']}</h2>
-        </div>
-        <div class="box-content">
-            <div class="row-fluid">
-                <legend>Users with permissions in domain </legend>
-		<table class="table table-striped table-bordered bootstrap-datatable datatable">
-		    <thead>
-			    <tr>
-				    <th>User ID</th>
-				    <th>Username</th>
-					<th>Permissions</th>
-					<th></th>
-			    </tr>
-		    </thead>
-		    <tbody>
-			{foreach from=$hook_info['Domain_Management']['userlist'] item=element}
-			  <tr>
-				<td>{$element.id}</td>
-				<td class="center"><a href="index.php?page=show_user&id={$element.id}">{$element.username}</a></td>
-				<td class="center">{$hook_info['Domain_Management']['permissions'][{$element.id}-1]['AccessPrivilege']}</td>
-				<td class="center">
-					<div class="btn-group" style="display: inline-block;">
-						<a class="btn btn-info" href="index.php?page=settings&id={$element.id}"><i class=" icon-pencil icon-white"></i> Edit User Permissions</a>
-					</div>
-				</td>
-			  </tr>
-			  {/foreach}
-		    </tbody>
-	    </table>
-	    </div>
-	</div>
-	</div>
-    </div><!--/span-->
-
-	<div class="box col-md-3">
-	<div class="box-inner">
-	<div class="box-header well" data-original-title="">
-            <h2><i class="icon-pencil"></i> Modify Domain Settings</h2>
-        </div>
-	 <div class="box-content">
-            <div class="row-fluid">
-
-		<form id="modifyMailSGroup" class="form-vertical" method="post" action="index.php?page=show_sgroup&id=">
-
-		<legend style="margin:0"> Domain Settings of '{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_name']}'</legend>
-
-		<div class="control-group disabled" style="display: inline-block; ">
-		    <label class="control-label">Domain ID</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="domain_id" name="domain_id" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_id']}" disabled>
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Domain Name</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="domain_name" name="domain_name" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_name']}">
-				</div>
-		    </div>
-		</div>
-		
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Domain Status</label>		
-			<div class="controls">
-				<select id="status" multiple class="form-control" data-rel="chosen">
-					<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_close"}selected{/if}>ds_close</option>
-					<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_dev"}selected{/if}>ds_dev</option>
-					<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_restricted"}selected{/if}>ds_restricted</option>
-					<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_open"}selected{/if}>ds_open</option>
-				</select>
+{if $permission eq 3}
+	{if isset($smarty.get.edit_domain)}
+	<div class="row-fluid sortable ui-sortable">
+		<div class="box col-md-9">
+		<div class="box-inner">
+			<div class="box-header well" data-original-title="">
+				<h2><i class="icon-list"></i> {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_name']}</h2>
 			</div>
-		</div>
-		
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Patch Version</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="patch_version" name="patch_version" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['patch_version']}">
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Backup Patch URL</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="backup_patch_url" name="backup_patch_url" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['backup_patch_url']}">
-				</div>
-		    </div>
-		</div>
-		
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Patch URLs</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<textarea id="patch_urls" name="patch_urls" >{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['patch_urls']}</textarea>
-				</div>
-		    </div>
-		</div>
-		
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Login Address</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="login_address" name="login_address" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['login_address']}">
-				</div>
-		    </div>
-		</div>
-		
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Session Manager Address</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="session_manager_address" name="session_manager_address" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['session_manager_address']}">
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Ring DB Name</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="ring_db_name" name="ring_db_name" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['ring_db_name']}">
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Web Host</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="web_host" name="web_host" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['web_host']}">
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Web Host PHP</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<input type="text" id="web_host_php" name="web_host_php" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['web_host_php']}">
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group" style="display: inline-block; ">
-		    <label class="control-label">Description</label>
-		    <div class="controls">
-				<div class="input-prepend">
-					<textarea id="description" name="description" >{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['description']}</textarea>
-				</div>
-		    </div>
-		</div>
-
-		<div class="control-group">
-		    <label class="control-label"></label>
-		    <div class="controls">
-			<button type="submit" class="btn btn-primary" >Update</button>
-		    </div>
-		</div>
-
-		{if isset($RESULT_OF_MODIFYING) and $RESULT_OF_MODIFYING eq "SUCCESS"}
-		<div class="alert alert-success">
-			{$modify_mail_of_group_success}
-		</div>
-		{/if}
-
-		</form>
-	    </div>
-	 </div>
-	 </div>
-</div>
-
-</div><!--/row-->
-{else}
-<table class="table table-striped table-bordered">
+			<div class="box-content">
+				<div class="row-fluid">
+					<legend>Users with permissions in domain </legend>
+			<table class="table table-striped table-bordered bootstrap-datatable datatable">
 				<thead>
 					<tr>
-						<th>Domain ID</th>
-						<th>Domain Name</th>
-						<th>Status</th>
-						<th>Patch Version</th>
-						<th>Description</th>			   
+						<th>User ID</th>
+						<th>Username</th>
+						<th>Permissions</th>
+						<th></th>
 					</tr>
 				</thead>
-		    <tbody>
-			{if isset($hook_info['Domain_Management']['domains'][0])}
-				{foreach from=$hook_info['Domain_Management']['domains'] item=array}
-					<tr>
-						<td>{$array['domain_id']}</td>
-						<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_name']}</a></td>
-						<td>{$array['status']}</td>
-						<td>{$array['patch_version']}</td>
-						<td>{$array['description']|truncate}</td>	
-					</tr>
-				{/foreach}
+				<tbody>
+				{foreach from=$hook_info['Domain_Management']['userlist'] item=element}
+				  <tr>
+					<td>{$element.id}</td>
+					<td class="center"><a href="index.php?page=show_user&id={$element.id}">{$element.username}</a></td>
+					<td class="center">{$hook_info['Domain_Management']['permissions'][{$element.id}-1]['AccessPrivilege']}</td>
+					<td class="center">
+						<div class="btn-group" style="display: inline-block;">
+							<a class="btn btn-info" href="index.php?page=settings&id={$element.id}"><i class=" icon-pencil icon-white"></i> Edit User Permissions</a>
+						</div>
+					</td>
+				  </tr>
+				  {/foreach}
+				</tbody>
+			</table>
+			</div>
+		</div>
+		</div>
+		</div><!--/span-->
+
+		<div class="box col-md-3">
+		<div class="box-inner">
+		<div class="box-header well" data-original-title="">
+				<h2><i class="icon-pencil"></i> Modify Domain Settings</h2>
+			</div>
+		 <div class="box-content">
+				<div class="row-fluid">
+
+			<form id="modifyMailSGroup" class="form-vertical" method="post" action="index.php?page=show_sgroup&id=">
+
+			<legend style="margin:0"> Domain Settings of '{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_name']}'</legend>
+
+			<div class="control-group disabled" style="display: inline-block; ">
+				<label class="control-label">Domain ID</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="domain_id" name="domain_id" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_id']}" disabled>
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Domain Name</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="domain_name" name="domain_name" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['domain_name']}">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Domain Status</label>		
+				<div class="controls">
+					<select id="status" multiple class="form-control" data-rel="chosen">
+						<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_close"}selected{/if}>ds_close</option>
+						<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_dev"}selected{/if}>ds_dev</option>
+						<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_restricted"}selected{/if}>ds_restricted</option>
+						<option {if {$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['status']} eq "ds_open"}selected{/if}>ds_open</option>
+					</select>
+				</div>
+			</div>
+			
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Patch Version</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="patch_version" name="patch_version" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['patch_version']}">
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Backup Patch URL</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="backup_patch_url" name="backup_patch_url" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['backup_patch_url']}">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Patch URLs</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<textarea id="patch_urls" name="patch_urls" >{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['patch_urls']}</textarea>
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Login Address</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="login_address" name="login_address" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['login_address']}">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Session Manager Address</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="session_manager_address" name="session_manager_address" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['session_manager_address']}">
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Ring DB Name</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="ring_db_name" name="ring_db_name" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['ring_db_name']}">
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Web Host</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="web_host" name="web_host" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['web_host']}">
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Web Host PHP</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<input type="text" id="web_host_php" name="web_host_php" value="{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['web_host_php']}">
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group" style="display: inline-block; ">
+				<label class="control-label">Description</label>
+				<div class="controls">
+					<div class="input-prepend">
+						<textarea id="description" name="description" >{$hook_info['Domain_Management']['domains'][$smarty.get.edit_domain-1]['description']}</textarea>
+					</div>
+				</div>
+			</div>
+
+			<div class="control-group">
+				<label class="control-label"></label>
+				<div class="controls">
+				<button type="submit" class="btn btn-primary" >Update</button>
+				</div>
+			</div>
+
+			{if isset($RESULT_OF_MODIFYING) and $RESULT_OF_MODIFYING eq "SUCCESS"}
+			<div class="alert alert-success">
+				{$modify_mail_of_group_success}
+			</div>
 			{/if}
-	</tbody>
- </table>
-{/if}		
+
+			</form>
+			</div>
+		 </div>
+		 </div>
+	</div>
+
+	</div><!--/row-->
+	{else}
+	<table class="table table-striped table-bordered">
+					<thead>
+						<tr>
+							<th>Domain ID</th>
+							<th>Domain Name</th>
+							<th>Status</th>
+							<th>Patch Version</th>
+							<th>Description</th>			   
+						</tr>
+					</thead>
+				<tbody>
+				{if isset($hook_info['Domain_Management']['domains'][0])}
+					{foreach from=$hook_info['Domain_Management']['domains'] item=array}
+						<tr>
+							<td>{$array['domain_id']}</td>
+							<td><a href="{$hook_info['Domain_Management']['path']}?page=layout_plugin&name=Domain_Management&edit_domain={$array['domain_id']}">{$array['domain_name']}</a></td>
+							<td>{$array['status']}</td>
+							<td>{$array['patch_version']}</td>
+							<td>{$array['description']|truncate}</td>	
+						</tr>
+					{/foreach}
+				{/if}
+		</tbody>
+	 </table>
+	{/if}	
+{/if}	
 {/block}
diff --git a/code/web/public_php/ams/templates/layout_admin.tpl b/code/web/public_php/ams/templates/layout_admin.tpl
index be6bd0765..d1d0901c5 100644
--- a/code/web/public_php/ams/templates/layout_admin.tpl
+++ b/code/web/public_php/ams/templates/layout_admin.tpl
@@ -1,5 +1,6 @@
 {extends file="layout.tpl"}
 {block name=menu}
+{if $permission eq 3}
 	<li class="nav-header hidden-tablet">Main</li>
 	<li style="margin-left: -2px;"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=show_user"><i class="icon-user"></i><span class="hidden-tablet"> Profile</span></a></li>
@@ -14,5 +15,6 @@
 	<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=plugins"><i class="icon-th-list"></i><span class="hidden-tablet"> Plugins</span></a></li>  
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=syncing"><i class="icon-th-list"></i><span class="hidden-tablet"> Syncing</span></a></li>
         <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
+{/if}
 {/block}
 
diff --git a/code/web/public_php/ams/templates/layout_mod.tpl b/code/web/public_php/ams/templates/layout_mod.tpl
index 63b992d3f..f5cc950b1 100644
--- a/code/web/public_php/ams/templates/layout_mod.tpl
+++ b/code/web/public_php/ams/templates/layout_mod.tpl
@@ -1,5 +1,6 @@
 {extends file="layout.tpl"}
 {block name=menu}
+{if $permission > 1}
 	<li class="nav-header hidden-tablet">Main</li>
 	<li style="margin-left: -2px;"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=show_user"><i class="icon-user"></i><span class="hidden-tablet"> Profile</span></a></li>
@@ -10,6 +11,7 @@
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=show_queue&get=todo"><i class="icon-th-list"></i><span class="hidden-tablet"> Queues</span></a></li>
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=sgroup_list"><i class="icon-briefcase"></i><span class="hidden-tablet"> Support Groups</span></a></li>
         <li class="nav-header hidden-tablet">Actions</li>
-        <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
+
+{/if}        <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
 {/block}
 
diff --git a/code/web/public_php/ams/templates/layout_user.tpl b/code/web/public_php/ams/templates/layout_user.tpl
index 800058bfa..845436e94 100644
--- a/code/web/public_php/ams/templates/layout_user.tpl
+++ b/code/web/public_php/ams/templates/layout_user.tpl
@@ -3,7 +3,7 @@
     <li class="nav-header hidden-tablet">Main</li>
     <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=show_user"><i class="icon-user"></i><span class="hidden-tablet">Profile</span></a></li>
     <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
-    {if isset($hook_info)} {foreach from=$hook_info key=arrkey item=element}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&name={$arrkey}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.menu_display}</span></a></li>{/foreach}{/if}	
+    {if isset($hook_info)} {foreach from=$hook_info key=arrkey item=element}{if isset($element.user_display)}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&name={$arrkey}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.user_display}</span></a></li>{/if}{/foreach}{/if} 
     <li class="nav-header hidden-tablet">Actions</li>
     <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=createticket"><i class="icon-pencil"></i><span class="hidden-tablet">Create New Ticket</span></a></li> 
     <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>