diff --git a/code/web/public_php/ams/css/charisma-app.css b/code/web/public_php/ams/css/charisma-app.css
index 7b6ae40fa..cbd2290e0 100644
--- a/code/web/public_php/ams/css/charisma-app.css
+++ b/code/web/public_php/ams/css/charisma-app.css
@@ -46,19 +46,19 @@ height: 16px;
 padding: 0 5px;
 font-family: Arial, sans-serif;
 color: white !important;
-text-shadow: 0 1px 
+text-shadow: 0 1px
 hsla(0, 0%, 0%, 0.25);
 border-width: 1px;
 border-style: solid;
 border-radius: 10px;
 -webkit-border-radius: 10px;
 -moz-border-radius: 10px;
--webkit-box-shadow: 0 1px 1px 
-hsla(0, 0%, 0%, 0.08), inset 0 1px 
+-webkit-box-shadow: 0 1px 1px
+hsla(0, 0%, 0%, 0.08), inset 0 1px
 hsla(0, 100%, 100%, 0.3);
 -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.08), inset 0 1px rgba(255, 255, 255, 0.3);
-box-shadow: 0 1px 1px 
-hsla(0, 0%, 0%, 0.08), inset 0 1px 
+box-shadow: 0 1px 1px
+hsla(0, 0%, 0%, 0.08), inset 0 1px
 hsla(0, 100%, 100%, 0.3);
 }
 
@@ -128,7 +128,7 @@ border: 1px solid #DEDEDE;
 border-radius:3px;
 -webkit-border-radius:3px;
 -moz-border-radius:3px;
-margin-top: 10px; 
+margin-top: 10px;
 margin-bottom: 10px ;
 box-shadow: 0 0 10px rgba(189, 189, 189, 0.4);
 -webkit-box-shadow: 0 0 10px rgba(189, 189, 189, 0.4);
@@ -145,7 +145,7 @@ border-radius:3px 3px 0 0;
 height:12px;
 min-height:12px;
 margin-bottom: 0;
-cursor:move;
+/*cursor:move;*/
 font-weight:bold;
 font-size:16px;
 background: -moz-linear-gradient(top,  rgba(255,255,255,0) 0%, rgba(0,0,0,0.1) 100%);
@@ -343,7 +343,7 @@ margin-right:-2px;
 margin-left:-2px;
 }
 .brand{
-font-family: 'Shojumaru', cursive, Arial, serif; 
+font-family: 'Shojumaru', cursive, Arial, serif;
 letter-spacing:2px;
 text-shadow:1px 1px 5px rgba(0, 0, 0, 0.5);
 width:166px;
@@ -368,7 +368,7 @@ margin-bottom:0;
 }
 @media (min-width: 768px) and (max-width: 979px) {
 .box-icon{
-	display:none;	
+	display:none;
 }
 .box-header h2{
 	font-size:13px !important;
@@ -389,8 +389,8 @@ margin-left:10px;
 border-radius:0 0 10px 10px;
 -webkit-border-radius:0 0 10px 10px;
 -moz-border-radius:0 0 10px 10px;
-padding-top:5px; 
-padding-bottom:5px; 
+padding-top:5px;
+padding-bottom:5px;
 }
 div.dataTables_length select {
 width: 50px;
diff --git a/code/web/public_php/ams/templates/createticket.tpl b/code/web/public_php/ams/templates/createticket.tpl
index bd0564932..e6acfc9ed 100644
--- a/code/web/public_php/ams/templates/createticket.tpl
+++ b/code/web/public_php/ams/templates/createticket.tpl
@@ -3,16 +3,12 @@
     <div class="box span8">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-th"></i> Create a new Ticket</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
                 <form id="changePassword" class="form-vertical" method="post" action="index.php?page=createticket&id={$target_id}">
                     <legend>New ticket</legend>
-                    
+
                     <div class="control-group">
                         <label class="control-label">Title</label>
                         <div class="controls">
@@ -21,7 +17,7 @@
                             </div>
                         </div>
                     </div>
-                    
+
                     <div class="control-group">
                         <label class="control-label">Category</label>
                         <div class="controls">
@@ -29,10 +25,10 @@
                                 {foreach from=$category key=k item=v}
                                         <option value="{$k}">{$v}</option>
                                 {/foreach}
-                            </select>	
+                            </select>
                         </div>
-                    </div> 
-                    
+                    </div>
+
                     <div class="control-group">
                         <label class="control-label">Description</label>
                         <div class="controls">
@@ -50,10 +46,10 @@
                             <button type="submit" class="btn btn-primary" style="margin-left:5px; margin-top:10px;">Send Ticket</button>
                         </div>
                     </div>
-                </form>		
-            </div>                   
+                </form>
+            </div>
         </div>
     </div><!--/span-->
 </div><!--/row-->
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/dashboard.tpl b/code/web/public_php/ams/templates/dashboard.tpl
index 778ced05f..893b8af2a 100644
--- a/code/web/public_php/ams/templates/dashboard.tpl
+++ b/code/web/public_php/ams/templates/dashboard.tpl
@@ -8,38 +8,32 @@
 			<div>Tickets Waiting for Direct Action</div>
 			<span class="notification red">{$nrAssignedWaiting}</span>
 		</a>
-	
+
 		<a data-original-title="{$nrToDo} Tickets Todo." data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_queue&get=todo">
 			<span class="icon32 icon-blue icon-tag"></span>
 			<div>Tickets Todo</div>
 			<span class="notification red">{$nrToDo}</span>
 		</a>
-	
+
 		<a data-original-title="By {$newestTicketAuthor}" data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_ticket&id={$newestTicketId}">
 			<span class="icon32 icon-blue icon-flag"></span>
 			<div>Newest Ticket</div>
 			<span class="notification blue">{$newestTicketTitle}</span>
 		</a>
-		
+
 		<a data-original-title="{$nrTotalTickets} tickets in total" data-rel="tooltip" class="well span3 top-block" href="index.php?page=show_queue&get=all">
 			<span class="icon32 icon-blue icon-archive"></span>
 			<div>Total amount of Tickets</div>
 			<span class="notification blue">{$nrTotalTickets}</span>
 		</a>
-		
-	
+
+
 	</div>
-	
+
 	<div class="row-fluid">
 		<div class="box span12">
 			<div class="box-header well">
 				<h2><i class="icon-info-sign"></i> {$home_title}</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-round" onclick="javascript:show_help('intro');return false;"><i class="icon-info-sign"></i></a>
-					<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<p><strong>{$home_info}</strong></p>
@@ -61,12 +55,12 @@
 					<li>Browse additional info sent along when a ticket is created ingame</li>
 					<li>All the above can be done while ingame too</li>
 				</ul>
-					
+
 				<div class="clearfix"></div>
 			</div>
 		</div>
 	</div>
-	
+
 
 {/block}
 
diff --git a/code/web/public_php/ams/templates/homebackup.tpl b/code/web/public_php/ams/templates/homebackup.tpl
index 8ba4ae14f..8414c1cd3 100644
--- a/code/web/public_php/ams/templates/homebackup.tpl
+++ b/code/web/public_php/ams/templates/homebackup.tpl
@@ -113,12 +113,6 @@
 				<div class="box span12">
 					<div class="box-header well">
 						<h2><i class="icon-info-sign"></i> Introduction</h2>
-						<div class="box-icon">
-							<a href="#" class="btn btn-round" onclick="javascript:show_help('test');return false;"><i class="icon-info-sign"></i></a>
-							<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-							<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-						</div>
 					</div>
 					<div class="box-content">
 						<h1>Charisma <small>free, premium quality, responsive, multiple skin admin template.</small></h1>
diff --git a/code/web/public_php/ams/templates/install_plugin.tpl b/code/web/public_php/ams/templates/install_plugin.tpl
index 968d6cec4..0d66e2921 100644
--- a/code/web/public_php/ams/templates/install_plugin.tpl
+++ b/code/web/public_php/ams/templates/install_plugin.tpl
@@ -1,15 +1,9 @@
 {block name=content}
-	
+
 	<div class="row-fluid">
 		<div class="box span12">
 			<div class="box-header well">
 				<h2><i class="icon-info-sign"></i>{$ip_title}</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-round" onclick="javascript:show_help('intro');return false;"><i class="icon-info-sign"></i></a>
-					<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<center>
@@ -22,7 +16,7 @@
 				<input type="button" value="Upload" onclick="uploadPlugin()"></br>
 				<h3 id="status"></h3>
 				 {if isset($smarty.get.result) and $smarty.get.result eq "0"}<p>{$ip_file_nfnd}</p>{/if}
-				 {if isset($smarty.get.result) and $smarty.get.result eq "2"}<p>{$ip_info_nfound}</p>{/if}	
+				 {if isset($smarty.get.result) and $smarty.get.result eq "2"}<p>{$ip_info_nfound}</p>{/if}
 				</div>
 				{$ip_message}
 				</center>
@@ -31,6 +25,6 @@
 		</div>
 	</div>
 		</div><!--/span-->
-			
+
 			</div><!--/row-->
 {/block}
diff --git a/code/web/public_php/ams/templates/layout.tpl b/code/web/public_php/ams/templates/layout.tpl
index 9665cfee3..f2a1f2c0c 100644
--- a/code/web/public_php/ams/templates/layout.tpl
+++ b/code/web/public_php/ams/templates/layout.tpl
@@ -18,7 +18,7 @@
 	<meta name="author" content="Daan Janssens & Matthew Lagoe">
 
 	<!-- The styles -->
-	<link id="bs-css" href="css/bootstrap-cerulean.css" rel="stylesheet">
+	<link id="bs-css" href="css/bootstrap-classic.css" rel="stylesheet">
 	<style type="text/css">
 	  body {
 		padding-bottom: 40px;
@@ -70,7 +70,7 @@
 				<a class="brand" href="index.php"> <img alt="Ryzom Core Logo" src="img/ryzomcore_166_62.png"></a>
 
 				<!-- theme selector starts -->
-				<div class="btn-group pull-right theme-container">
+				<!--<div class="btn-group pull-right theme-container">
 					<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
 						<i class="icon-tint"></i><span class="hidden-phone"> Change Theme / Skin</span>
 						<span class="caret"></span>
@@ -86,7 +86,7 @@
 						<li><a data-value="spacelab" href="#"><i class="icon-blank"></i> Spacelab</a></li>
 						<li><a data-value="united" href="#"><i class="icon-blank"></i> United</a></li>
 					</ul>
-				</div>
+				</div>-->
 				<!-- theme selector ends -->
 				<!-- user dropdown starts -->
 				{if isset($username)}
@@ -312,7 +312,7 @@
 	<!-- history.js for cross-browser state change on ajax -->
 	<script src="js/jquery.history.js"></script>
 	<!-- application script for Charisma demo -->
-	<script src="js/charisma.js"></script>
+	<!-- <script src="js/charisma.js"></script> -->
 	<!-- help script for page help -->
 	<script src="js/help.js"></script>
 
diff --git a/code/web/public_php/ams/templates/plugins.tpl b/code/web/public_php/ams/templates/plugins.tpl
index 6d864c818..e299fc965 100644
--- a/code/web/public_php/ams/templates/plugins.tpl
+++ b/code/web/public_php/ams/templates/plugins.tpl
@@ -1,13 +1,8 @@
 {block name=content}
-<div class="row-fluid">	
+<div class="row-fluid">
 				<div class="box span12">
 					<div class="box-header well" data-original-title>
 						<h2><i class="icon-user"></i> {$plugin_title}</h2>
-						<div class="box-icon">
-							<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-							<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-						</div>
 					</div>
 					{if isset($smarty.get.result) and $smarty.get.result eq "1"}<div class="alert alert-error"><p>{$ip_success}</p></div>{/if}
 					{if isset($smarty.get.result) and $smarty.get.result eq "0"}<div class="alert alert-error"><p>{$dp_error}</p></div>{/if}
@@ -27,7 +22,7 @@
 						<table class="table table-striped table-bordered">
 						  <thead>
 							  <tr>
-								  <th>{$plugin_status}</th>	
+								  <th>{$plugin_status}</th>
 								  <th width="100">{$plugin_name}</th>
 								  <th>{$plugin_version}</th>
 								  <th width="350">{$plugin_description}</th>
@@ -35,7 +30,7 @@
 								  <th>{$plugin_permission}</th>
 								  <th>{$plugin_actions}</th>
 							  </tr>
-						  </thead>   
+						  </thead>
 						  <tbody>
 							{foreach from=$plug item=element}
 							<tr>
@@ -52,7 +47,7 @@
                 {if ($element.plugin_status) eq "1"}<a href="index.php?page=plugins&action=deactivate_plugin&id={$element.id}"><button class="btn btn-primary btn-large dropdown-toggle">Deactivate</button></a>{/if}</td>
 							</tr>
 							{/foreach}
-					
+
 						  </tbody>
 					  </table>
 					  <div style="width: 300px; margin:0px auto;">
@@ -65,7 +60,7 @@
 						</ul>
 					  </div>
 					</div>
-					
+
 				</div><!--/span-->
 			</div><!--/row-->
 {/block}
diff --git a/code/web/public_php/ams/templates/plugins_update.tpl b/code/web/public_php/ams/templates/plugins_update.tpl
index afa93d80f..51aa3387d 100644
--- a/code/web/public_php/ams/templates/plugins_update.tpl
+++ b/code/web/public_php/ams/templates/plugins_update.tpl
@@ -1,26 +1,21 @@
 {block name=content}
-<div class="row-fluid">	
+<div class="row-fluid">
 				<div class="box span12">
 					<div class="box-header well" data-original-title>
 						<h2><i class="icon-user"></i> {$up_title}</h2>
-						<div class="box-icon">
-							<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-							<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-						</div>
 					</div>
 					<div class="box-content">
 						<center><p>{$up_info}</p></center>
 						<table class="table table-striped table-bordered">
 						  <thead>
-							  <tr>	
+							  <tr>
 								  <th width="100">{$plugin_name}</th>
 								  <th>{$plugin_version}</th>
 								  <th>{$up_updated_version}</th>
 								  <th width="500">{$up_description}</th>
 								  <th>{$up_actions}</th>
 							  </tr>
-						  </thead>   
+						  </thead>
 						  <tbody>
 							{foreach from=$plug item=element}
 							<tr>
@@ -31,7 +26,7 @@
 								<td><a href="index.php?page=plugins&action=update_plugins&id={$element.id}"><button class="btn btn-primary btn-large">Update</button></a>
 							</tr>
 							{/foreach}
-					
+
 						  </tbody>
 					  </table>
 					  <div style="width: 300px; margin:0px auto;">
@@ -44,7 +39,7 @@
 						</ul>
 					  </div>
 					</div>
-					
+
 				</div><!--/span-->
 			</div><!--/row-->
 {/block}
diff --git a/code/web/public_php/ams/templates/settings.tpl b/code/web/public_php/ams/templates/settings.tpl
index e4c545c98..0d27bc749 100644
--- a/code/web/public_php/ams/templates/settings.tpl
+++ b/code/web/public_php/ams/templates/settings.tpl
@@ -3,16 +3,12 @@
 		<div class="box span4">
 			<div class="box-header well" data-original-title="">
 				<h2><i class="icon-th"></i> Change Password</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<div class="row-fluid">
 					<form id="changePassword" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
 						<legend>Change Password</legend>
-						
+
 						{if !isset($changesOther) or $changesOther eq "FALSE"}
 							<div class="control-group {if isset($MATCH_ERROR) and $MATCH_ERROR eq "TRUE"}error{else if
 				isset($match_error_message) and $match_error_message neq "fail"}success{else}{/if}">
@@ -37,7 +33,7 @@
 							   </div>
 							</div>
 						</div>
-							
+
 						<div class="control-group {if isset($CNEWPASSWORD_ERROR) and $CNEWPASSWORD_ERROR eq "TRUE"}error{else if
 			isset($confirmnewpass_error_message) and $confirmnewpass_error_message eq "success"}success{else}{/if}">
 						<label class="control-label">Confirm New Password</label>
@@ -49,21 +45,21 @@
 							    </div>
 							</div>
 						</div>
-						
-						
-					
+
+
+
 						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
 						<div class="alert alert-success">
 							The password has been changed!
 						</div>
 						{/if}
-						
+
 						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
 						<div class="alert alert-warning">
 							The password has been changed, though the shard seems offline, it may take some time to see the change on the shard.
 						</div>
 						{/if}
-						
+
 						<input type="hidden" name="function" value="change_password">
 						<input type="hidden" name="target_id" value="{$target_id}">
 						<div class="control-group">
@@ -72,25 +68,21 @@
 								<button type="submit" class="btn btn-primary" style="margin-left:5px; margin-top:10px;">Change Password</button>
 							</div>
 						</div>
-					</form>		
-				</div>                   
+					</form>
+				</div>
 			</div>
 		</div><!--/span-->
-		
-		
+
+
 		<div class="box span4">
 			<div class="box-header well" data-original-title="">
 				<h2><i class="icon-th"></i> Add User</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<div class="row-fluid">
 					<form id="addUser" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
 						<legend>Add User</legend>
-											
+
 						<div class="control-group">
 							<label class="control-label">Username</label>
 								<div class="controls">
@@ -99,8 +91,8 @@
 										<input type="text" value="Username" placeholder="Username" name="Username" id="Username" class="input-xlarge">
 									</div>
 								</div>
-						</div>												
-						
+						</div>
+
 						<div class="control-group ">
 							<label class="control-label">Password</label>
 								<div class="controls">
@@ -110,7 +102,7 @@
 									 </div>
 								</div>
 						</div>
-																		
+
 						<div class="control-group ">
 							<label class="control-label">Confirm Password</label>
 								<div class="controls">
@@ -120,30 +112,30 @@
 									 </div>
 								</div>
 						</div>
-						
+
 						<div class="control-group ">
 						<label class="control-label">Email</label>
 							<div class="controls">
 							    <div class="input-prepend">
 								<span style="margin-left:5px;" class="add-on"><i class="icon-envelope"></i></span>
-									<input type="text" value="Email" placeholder="Email" name="Email" id="Email" class="input-xlarge">		
+									<input type="text" value="Email" placeholder="Email" name="Email" id="Email" class="input-xlarge">
 							    </div>
 							</div>
 						</div>
-						
-											
+
+
 						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "OK"}
 						<div class="alert alert-success">
 							The user is created!
 						</div>
 						{/if}
-						
+
 						{if isset($SUCCESS_PASS) and $SUCCESS_PASS eq "SHARDOFF"}
 						<div class="alert alert-warning">
 							The user can't be created.
 						</div>
 						{/if}
-						
+
 						<input type="hidden" name="function" value="add_user">
 						<input type="hidden" name="target_id" value="{$target_id}">
 						<div class="control-group">
@@ -152,19 +144,15 @@
 								<button type="submit" class="btn btn-primary" style="margin-left:5px; margin-top:10px;">Create User</button>
 							</div>
 						</div>
-					</form>		
-				</div>                   
+					</form>
+				</div>
 			</div>
 		</div><!--/span-->
-		
-				
+
+
 		<div class="box span4">
 			<div class="box-header well" data-original-title="">
 				<h2><i class="icon-th"></i> Change Email</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<div class="row-fluid">
@@ -177,24 +165,24 @@
 								<span class="add-on" style="margin-left:5px;"><i class="icon-envelope"></i></span>
 									<input type="text" class="input-xlarge" id="NewEmail" name="NewEmail" placeholder="Your new email" {if isset($prevNewEmail)}value="{$prevNewEmail}"{else if isset($current_mail)}value="{$current_mail}"{/if}>
 									{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}<span class="help-inline">{$EMAIL}</span>{/if}
-						
+
 							    </div>
 							</div>
 						</div>
-						
-						
+
+
 						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "OK"}
 						<div class="alert alert-success">
 							The email has been changed!
 						</div>
 						{/if}
-						
+
 						{if isset($SUCCESS_MAIL) and $SUCCESS_MAIL eq "SHARDOFF"}
 						<div class="alert alert-warning">
 							The email has been changed, though the shard seems offline, it may take some time to see the change on the shard.
 						</div>
 						{/if}
-						
+
 						<input type="hidden" name="function" value="change_mail">
 						<input type="hidden" name="target_id" value="{$target_id}">
 						<div class="control-group">
@@ -204,37 +192,33 @@
 							</div>
 						</div>
 					</form>
-				</div>                   
-			</div>
-		</div>
-		
-		<div class="box span4">
-			
-			<div class="box-header well" data-original-title="">
-				<h2><i class="icon-envelope"></i> Ticket updates</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
 				</div>
 			</div>
-			
-			
+		</div>
+
+		<div class="box span4">
+
+			<div class="box-header well" data-original-title="">
+				<h2><i class="icon-envelope"></i> Ticket updates</h2>
+			</div>
+
+
 			<div class="box-content">
 				<div class="row-fluid">
 					<form id="changeReceiveMail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
 						<legend>Ticket-Update Mail Settings</legend>
-						
+
 						<div class="control-group">
 							<label class="control-label">Receive ticket updates</label>
 							<div class="controls">
-								 <select name="ReceiveMail">	
+								 <select name="ReceiveMail">
 									<option value="1" {if isset($ReceiveMail) and $ReceiveMail eq 1}selected="selected"{/if}>Yes</option>
 									<option value="0" {if isset($ReceiveMail) and $ReceiveMail eq 0}selected="selected"{/if}>No</option>
-								</select>	
+								</select>
 							</div>
 
 						</div>
-						
+
 						<input type="hidden" name="function" value="change_receivemail">
 						<input type="hidden" name="target_id" value="{$target_id}">
 						<div class="control-group">
@@ -247,20 +231,16 @@
 				</div>
 			</div>
 		</div><!--/span-->
-				
+
 		<div class="box span4">
 			<div class="box-header well" data-original-title="">
 				<h2><i class="icon-th"></i> Change Info</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<div class="row-fluid">
 					<form id="changeEmail" class="form-vertical" method="post" action="index.php?page=settings&id={$target_id}">
 						<legend>Change Info</legend>
-						
+
 						<div class="control-group">
 						<label class="control-label">Firstname</label>
 							<div class="controls">
@@ -270,7 +250,7 @@
 								</div>
 							</div>
 						</div>
-						
+
 						<div class="control-group">
 						<label class="control-label">Lastname</label>
 							<div class="controls">
@@ -280,7 +260,7 @@
 								</div>
 							</div>
 						</div>
-						
+
 						<div class="control-group">
 						<label class="control-label">Country</label>
 							<div class="controls">
@@ -288,13 +268,13 @@
 									{foreach from=$country_array key=k item=v}
 										<option value="{$k}" {if isset($Country) and $Country eq $k}selected="selected"{/if}>{$v}</option>
 									{/foreach}
-								</select>	
+								</select>
 							</div>
 						</div>
-						
+
 						<div class="control-group">
 							<label class="control-label">Gender</label>
-							<div class="controls">							
+							<div class="controls">
 								<label class="radio">
 								      <div id="uniform-optionsRadios2" class="radio"><span class="{if isset($Gender) and $Gender eq 0}checked{/if}"><input style="opacity: 0;" name="Gender" id="optionsRadios0" value="0" {if isset($Gender) and $Gender eq 0}checked=""{/if} type="radio"></span></div>
 								      Secret
@@ -311,13 +291,13 @@
 								</label>
 							</div>
 						</div>
-										
+
 						{if isset($info_updated) and $info_updated eq "OK"}
 						<div class="alert alert-success">
 							The Info has been updated!
 						</div>
 						{/if}
-						
+
 						<input type="hidden" name="function" value="change_info">
 						<input type="hidden" name="target_id" value="{$target_id}">
 						<div class="control-group">
@@ -327,12 +307,12 @@
 							</div>
 						</div>
 					</form>
-				</div>                   
+				</div>
 			</div>
 		</div><!--/span-->
 	</div><!--/row-->
-			
-			
-	
+
+
+
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/sgroup_list.tpl b/code/web/public_php/ams/templates/sgroup_list.tpl
index a8df71bd8..dde9aa4ce 100644
--- a/code/web/public_php/ams/templates/sgroup_list.tpl
+++ b/code/web/public_php/ams/templates/sgroup_list.tpl
@@ -5,10 +5,6 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-list"></i> List</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -22,7 +18,7 @@
 				    <th>Email</th>
 				    {if isset($isAdmin) && $isAdmin eq 'TRUE'}<th>Action</th>{/if}
 			    </tr>
-		    </thead>   
+		    </thead>
 		    <tbody>
 			{foreach from=$grouplist item=group}
 			  <tr>
@@ -33,9 +29,9 @@
 				{if isset($isAdmin) && $isAdmin eq 'TRUE'}<td class="center"><a class="btn btn-danger" href="index.php?page=sgroup_list&delete={$group.sGroupId}"><i class="icon-trash icon-white"></i> Delete</a></td>{/if}
 			  </tr>
 			  {/foreach}
-	  
+
 		    </tbody>
-	    </table>            
+	    </table>
 	    </div>
 	</div>
     </div><!--/span-->
@@ -43,18 +39,14 @@
     <div class="box span3">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-plus-sign"></i> Add</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
-		
+
 		<form id="addSGroup" class="form-vertical" method="post" action="index.php?page=sgroup_list">
-		    
+
 		<legend>Add  a support group</legend>
-		
+
 		<div class="control-group">
 		    <label class="control-label">Group name</label>
 		    <div class="controls">
@@ -63,7 +55,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group">
 		    <label class="control-label">Group Tag</label>
 		    <div class="controls">
@@ -72,7 +64,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group">
 		    <label class="control-label">Group EmailAddress</label>
 		    <div class="controls">
@@ -81,7 +73,7 @@
 			</div>
 		    </div>
 		</div>
-				
+
 		<div class="control-group">
 		    <label class="control-label">IMAP MailServer IP</label>
 		    <div class="controls">
@@ -90,7 +82,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group">
 		    <label class="control-label">IMAP Username</label>
 		    <div class="controls">
@@ -99,7 +91,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group">
 		    <label class="control-label">IMAP Password</label>
 		    <div class="controls">
@@ -108,16 +100,16 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<input type="hidden" name="function" value="add_sgroup">
-		
+
 		<div class="control-group">
 		    <label class="control-label"></label>
 		    <div class="controls">
 			<button type="submit" class="btn btn-primary" >Add</button>
 		    </div>
 		</div>
-		
+
 		{if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "SUCCESS"}
 		<div class="alert alert-success">
 			{$group_success}
@@ -136,11 +128,11 @@
 		</div>
 		{/if}
 		</form>
-		
-	    </div>                   
+
+	    </div>
         </div>
     </div><!--/span-->
     {/if}
 </div><!--/row-->
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/show_queue.tpl b/code/web/public_php/ams/templates/show_queue.tpl
index 273322db6..0129e60b2 100644
--- a/code/web/public_php/ams/templates/show_queue.tpl
+++ b/code/web/public_php/ams/templates/show_queue.tpl
@@ -3,15 +3,11 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-tag"></i> Ticket Queue {$queue_view}</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
                 <legend>Tickets</legend>
-		
+
 		<div class="alert alert-info">
 		    <form id="create_queue" class="form-vertical" method="post" action="index.php?page=show_queue&get=create" style="margin:0px 0px 0px;">
 		    Show
@@ -49,11 +45,11 @@
 		    <input type="hidden" name="action" value="create_queue">
 		    <button type="submit" class="btn btn-primary" style="bottom:4px; position:relative;"  ><i class="icon-tag icon-white"></i> View</button>
 		    </form>
-		
-		    
+
+
 		</div>
 
-				
+
 		{if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_ASSIGNED"}
 		<div class="alert alert-success">
 			{$success_assigned}
@@ -75,7 +71,7 @@
 			{$ticket_not_assigned}
 		</div>
 		{/if}
-		
+
 		<table class="table table-striped table-bordered">
 		    <thead>
 			    <tr>
@@ -88,7 +84,7 @@
 				    <th>SupportGroup</th>
 				    <th>Actions</th>
 			    </tr>
-		    </thead>   
+		    </thead>
 		    <tbody>
 			  {foreach from=$tickets item=ticket}
 			  <tr>
@@ -97,16 +93,16 @@
 				<td>{if $ticket.assignedText neq ""} <a href="index.php?page=show_user&id={$ticket.assigned}">{$ticket.assignedText} {else}<i> {$not_assigned}</i> {/if}</td>
 				<td class="center"><span title="{$ticket.timestamp_elapsed}" data-rel="tooltip"  data-placement="right">{$ticket.timestamp}</span></td>
 				<td class="center">{$ticket.category}</td>
-				<td class="center"><span class="label {if $ticket.status eq 0}label-success{else if $ticket.status eq 1}label-warning{else if $ticket.status eq 2}label-important{/if}">{if $ticket.status eq 0} <i class="icon-exclamation-sign icon-white"></i>{/if} {$ticket.statusText}</span></td>  
+				<td class="center"><span class="label {if $ticket.status eq 0}label-success{else if $ticket.status eq 1}label-warning{else if $ticket.status eq 2}label-important{/if}">{if $ticket.status eq 0} <i class="icon-exclamation-sign icon-white"></i>{/if} {$ticket.statusText}</span></td>
 				<td class="center">
-				   
+
 				    {if $ticket.forwardedGroupName eq "0"}
 					<i>{$public_sgroup}</i>
 				    {else}
-					 <span class="label label-info"><a href="index.php?page=show_sgroup&id={$ticket.forwardedGroupId}"><font color="white">{$ticket.forwardedGroupName}</font></a></span> 
+					 <span class="label label-info"><a href="index.php?page=show_sgroup&id={$ticket.forwardedGroupId}"><font color="white">{$ticket.forwardedGroupName}</font></a></span>
 				    {/if}
-				      
-				</td>  
+
+				</td>
 				<td>
 				    {if $ticket.assigned eq 0}
 					<form id="assign_ticket" class="form-vertical" method="post" action="{$getURL}" style="margin:0px 0px 0px;">
@@ -124,10 +120,10 @@
 				</td>
 			  </tr>
 			  {/foreach}
-	  
+
 		    </tbody>
 	    </table>
-		
+
 	    <div style="width: 300px; margin:0px auto;">
 		<ul class="pagination">
 		    <li><a href="{$pagination_base_link}&pagenum=1">&laquo;</a></li>
@@ -140,14 +136,10 @@
 	    </div>
 	</div>
     </div><!--/span-->
-    
+
     <div class="box span3">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-th"></i>Actions</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -163,7 +155,7 @@
 		    <li class="divider"></li>
                 </ul>
               </div>
-            </div>                   
+            </div>
         </div>
     </div><!--/span-->
 </div><!--/row-->
@@ -173,10 +165,10 @@
 
 <!----- /javascript for this page -->
 <script type="text/javascript">
-    function aimedforwhochanged(value) 
+    function aimedforwhochanged(value)
 {
-	
-if (value == "user") 
+
+if (value == "user")
     {
     //hide the supportGroupList span
     var elem = document.getElementById("supportGroupList");
@@ -195,4 +187,4 @@ else if(value == "support_group")
 }
 </script>
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/show_reply.tpl b/code/web/public_php/ams/templates/show_reply.tpl
index 65f3f679b..560b54474 100644
--- a/code/web/public_php/ams/templates/show_reply.tpl
+++ b/code/web/public_php/ams/templates/show_reply.tpl
@@ -3,10 +3,6 @@
     <div class="box span12">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-user"></i> Show Reply</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -21,13 +17,13 @@
 			    <span class="label label-warning"><strong><i class="icon-star icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$author}"><font color="white"> {$authorName}</font>{else} {$authorName} {/if}</a></strong></span></p>
 			    {/if}
 			    <p><pre{if $author_permission gt '1'} {if $hidden eq 0} style="background-color:rgb(248, 200, 200);"{else if $hidden eq 1}style="background-color:rgb(207, 254, 255);"{/if}{/if}> {if $hidden eq 1}<i>{/if}{$reply_content}{if $hidden eq 1}</i>{/if}</pre></p>
-			 
+
 			</td>
 		    </tr>
 		</table>
-	    </div>                   
+	    </div>
         </div>
     </div><!--/span-->
 </div><!--/row-->
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/show_sgroup.tpl b/code/web/public_php/ams/templates/show_sgroup.tpl
index 9d1b74d09..75459c737 100644
--- a/code/web/public_php/ams/templates/show_sgroup.tpl
+++ b/code/web/public_php/ams/templates/show_sgroup.tpl
@@ -3,10 +3,6 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-list"></i>{$groupsname} List</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -17,9 +13,9 @@
 				    <th>ID</th>
 				    <th>Name</th>
 				    {if isset($isAdmin) && $isAdmin eq 'TRUE'}<th>Action</th>{/if}
-		
+
 			    </tr>
-		    </thead>   
+		    </thead>
 		    <tbody>
 			{foreach from=$userlist item=user}
 			  <tr>
@@ -28,29 +24,25 @@
 				{if isset($isAdmin) && $isAdmin eq 'TRUE'}<td class="center"><a class="btn btn-danger" href="index.php?page=show_sgroup&id={$target_id}&delete={$user.tUserId}"><i class="icon-trash icon-white"></i> Delete</a></td>{/if}
 			  </tr>
 			  {/foreach}
-	  
+
 		    </tbody>
-	    </table>            
+	    </table>
 	    </div>
 	</div>
     </div><!--/span-->
-    
+
     {if isset($isAdmin) && $isAdmin eq 'TRUE'}
     <div class="box span3">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-plus-sign"></i> Add User</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
-		
+
 		<form id="addSGroup" class="form-vertical" method="post" action="index.php?page=show_sgroup&id={$target_id}">
-		    
+
 		<legend style="margin:0">Add user to '{$groupsname}'</legend>
-		
+
 		<div class="control-group" style="display: inline-block; ">
 		    <label class="control-label">username</label>
 		    <div class="controls">
@@ -63,17 +55,17 @@
 		    </select>
 		    </div>
 		</div>
-		
+
 		<input type="hidden" name="function" value="add_user_to_sgroup">
 		<input type="hidden" name="target_id" value="{$target_id}">
-		    
+
 		<div class="control-group">
 		    <label class="control-label"></label>
 		    <div class="controls">
 			<button type="submit" class="btn btn-primary" >Add</button>
 		    </div>
 		</div>
-		
+
 		{if isset($RESULT_OF_ADDING) and $RESULT_OF_ADDING eq "SUCCESS"}
 		<div class="alert alert-success">
 			{$add_to_group_success}
@@ -96,26 +88,22 @@
 		</div>
 		{/if}
 		</form>
-		
-	    </div>                   
+
+	    </div>
         </div>
 
     </div><!--/span-->
 	<div class="box span3">
 	<div class="box-header well" data-original-title="">
             <h2><i class="icon-pencil"></i> Modify Email Settings</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
 	 <div class="box-content">
             <div class="row-fluid">
-		
+
 		<form id="modifyMailSGroup" class="form-vertical" method="post" action="index.php?page=show_sgroup&id={$target_id}">
-		    
+
 		<legend style="margin:0">Mail settings of '{$groupsname}'</legend>
-		
+
 		<div class="control-group" style="display: inline-block; ">
 		    <label class="control-label">Group Email</label>
 		    <div class="controls">
@@ -124,7 +112,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group" style="display: inline-block; ">
 		    <label class="control-label">IMAP Mail Server</label>
 		    <div class="controls">
@@ -133,7 +121,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group" style="display: inline-block; ">
 		    <label class="control-label">IMAP Username</label>
 		    <div class="controls">
@@ -142,7 +130,7 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<div class="control-group" style="display: inline-block; ">
 		    <label class="control-label">IMAP Password</label>
 		    <div class="controls">
@@ -151,17 +139,17 @@
 			</div>
 		    </div>
 		</div>
-		
+
 		<input type="hidden" name="function" value="modify_email_of_sgroup">
 		<input type="hidden" name="target_id" value="{$target_id}">
-		    
+
 		<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}
@@ -175,14 +163,14 @@
 			{$no_password_given}
 		</div>
 		{/if}
-		
+
 		</form>
 	    </div>
 	 </div>
-</div>	 
+</div>
 
     {/if}
 </div><!--/row-->
 
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/show_ticket.tpl b/code/web/public_php/ams/templates/show_ticket.tpl
index 1ac5b2f46..ce935d6b2 100644
--- a/code/web/public_php/ams/templates/show_ticket.tpl
+++ b/code/web/public_php/ams/templates/show_ticket.tpl
@@ -3,22 +3,18 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-tag"></i>{$t_title} #{$ticket_tId} </h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
                 <legend>{$title}: {$ticket_title} </legend>
-		
-		
+
+
 		<form id="changeTicket" class="form-vertical" method="post" action="index.php">
 		<table class="table table-bordered table-condensed ">
 			<tr>
 			    <td><strong>Original Submitted: </strong>{$ticket_timestamp}</td>
 			    <td><strong>Last Updated: </strong>{$ticket_lastupdate}</td>
-			    <td><strong>Status: </strong>{if $ticket_status neq 3}<span class="label label-success">Open</span>{/if} <span class="label {if $ticket_status eq 0}label-success{else if $ticket_status eq 1}label-warning{else if $ticket_status eq 2}label-important{/if}"><strong>{$ticket_statustext}</strong></span></td> 
+			    <td><strong>Status: </strong>{if $ticket_status neq 3}<span class="label label-success">Open</span>{/if} <span class="label {if $ticket_status eq 0}label-success{else if $ticket_status eq 1}label-warning{else if $ticket_status eq 2}label-important{/if}"><strong>{$ticket_statustext}</strong></span></td>
 		      </tr>
 			<tr>
 			    <td><strong>Category: </strong>{$ticket_category}</td>
@@ -31,16 +27,16 @@
 					<a href="index.php?page=show_sgroup&id={$ticket_forwardedGroupId}"><font color="white">{$ticket_forwardedGroupName}</font></a>
 				    {/if}
 				</span>
-			    </td>                  
+			    </td>
 			</tr>
 			<tr>
 			    <td><strong>Assigned To: </strong>{if $ticket_assignedTo neq ""} <a href="index.php?page=show_user&id={$ticket_assignedTo}">{$ticket_assignedToText}</a> {else}<i> {$not_assigned}</i> {/if}</td>
 			    <td></td>
-			    <td></td> 
+			    <td></td>
 		      </tr>
 		</table>
-		
-		
+
+
 		<table class="table table-bordered" >
 		    <tbody>
 			{foreach from=$ticket_replies item=reply}
@@ -58,7 +54,7 @@
 			    </td>
 			</tr>
 			{/foreach}
-			
+
 			{if $ticket_status eq 3}
 			<tr>
 			    <td>
@@ -66,7 +62,7 @@
 			    </td>
 			</tr>
 			{/if}
-			
+
 			<tr>
 			    <td>
 				<form id="reply" class="form-vertical" method="post" action="index.php">
@@ -99,7 +95,7 @@
 					    {foreach from=$statusList key=k item=v}
 						    <option value="{$k}">{$v}</option>
 					    {/foreach}
-					</select>	
+					</select>
 				    </div>
 				</div>
 				<div class="control-group"  style="display: inline-block; margin-left:10px;"">
@@ -109,7 +105,7 @@
 					    {foreach from=$ticket_priorities key=k item=v}
 						    <option value="{$k}" {if $k eq $ticket_priority}selected="selected"{/if}>{$v}</option>
 					    {/foreach}
-					</select>	
+					</select>
 				    </div>
 				</div>
 				{/if}
@@ -126,25 +122,21 @@
 			</tr>
 		    </tbody>
 		</table>
-	    </div>                   
+	    </div>
         </div>
     </div><!--/span-->
-    
-    
-    
+
+
+
     <div class="box span3">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-th"></i>Actions</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
-		
+
 		{if isset($isMod) and $isMod eq "TRUE"}
-		
+
 		 <legend style="margin-bottom:9px;">Ticket Assigning</legend>
 		 {if $ticket_assignedTo eq 0}
 		    <form id="assign_ticket" class="form-vertical" method="post" action="" style="margin:0px 0px 0px;">
@@ -159,7 +151,7 @@
 			<button type="submit" class="btn btn-warning" style="margin-bottom:9px;><i class="icon-remove icon-white"></i> Remove Assign</button>
 		    </form>
 		{/if}
-				    
+
 		{if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_ASSIGNED"}
 		<div class="alert alert-success">
 			{$success_assigned}
@@ -181,10 +173,10 @@
 			{$ticket_not_assigned}
 		</div>
 		{/if}
-		
-		<legend style="margin-bottom:9px;">Forward to Group</legend>		    
+
+		<legend style="margin-bottom:9px;">Forward to Group</legend>
 		<form id="forward" class="form-vertical" method="post" action="" style="margin-bottom:9px;" >
-		
+
 		<div class="control-group">
 		    <div class="controls" >
 			<select name="group">
@@ -192,7 +184,7 @@
 			    {foreach from=$sGroups key=k item=v}
 				    <option value="{$k}">{$v}</option>
 			    {/foreach}
-			</select>	
+			</select>
 		    </div>
 		</div>
 		<input type="hidden" name="ticket_id" value="{$ticket_tId}">
@@ -228,9 +220,9 @@
 			<li class="divider"></li>
 		    </ul>
 		</div>
-            </div>                   
+            </div>
         </div>
     </div>
 </div><!--/row-->
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/show_ticket_info.tpl b/code/web/public_php/ams/templates/show_ticket_info.tpl
index ed09e1892..e3752cfd2 100644
--- a/code/web/public_php/ams/templates/show_ticket_info.tpl
+++ b/code/web/public_php/ams/templates/show_ticket_info.tpl
@@ -3,10 +3,6 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-tag"></i> <a href="index.php?page=show_ticket&id={$ticket_id}">[#{$ticket_id}] {$ticket_title}</a> </h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -21,16 +17,16 @@
 			    </tr>
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/user.png"/><strong> User_Id: </strong>{$user_id}</td>
-			    </tr>   
+			    </tr>
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/position.png"/><strong> User Position: </strong>{$user_position}</td>
 			    </tr>
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/view.png"/><strong> View Position: </strong>{$view_position}</td>
 			    </tr>
-    
+
 			    <tr>
-				<td><img src="{$IMAGELOC_WEBPATH}/info/client.png"/><strong> Client_Version: </strong> {$client_version}</td>              
+				<td><img src="{$IMAGELOC_WEBPATH}/info/client.png"/><strong> Client_Version: </strong> {$client_version}</td>
 			    </tr>
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/patch.png"/><strong> Patch_Version: </strong>{$patch_version}</td>
@@ -49,11 +45,11 @@
 			    </tr>
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/cpuid.png"/><strong> Cpu_Id: </strong>{$cpu_id}</td>
-			    </tr>			
+			    </tr>
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/mask.png"/><strong> Cpu_Mask: </strong>{$cpu_mask}</td>
 			    </tr>
-			    
+
 			     <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/ht.png"/><strong> HT: </strong>{$ht}</td>
 			    </tr>
@@ -63,7 +59,7 @@
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/nel.png"/><strong> NeL3D: </strong>{$nel3d}</td>
 			    </tr>
-			    
+
 			    <tr class="alert alert-info">
 				<td><center><strong> Network related </strong></center></td>
 			    </tr>
@@ -73,24 +69,20 @@
 			    <tr>
 				<td><img src="{$IMAGELOC_WEBPATH}/info/local.png"/><strong> Local_Address: </strong>{$local_address}</td>
 			    </tr>
-			   
+
 		    </table>
 		</div>
-	    </div>                   
+	    </div>
         </div>
     </div><!--/span-->
-    
+
     <div class="box span3">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-th"></i>Actions</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
-		
+
 		<legend style="margin-bottom:9px;">Actions</legend>
 		<div class="btn-group">
 		    <button class="btn btn-primary btn-large dropdown-toggle" data-toggle="dropdown">Actions<span class="caret"></span></button>
@@ -102,9 +94,9 @@
 			<li class="divider"></li>
 		    </ul>
 		</div>
-            </div>                   
+            </div>
         </div>
     </div>
 </div><!--/row-->
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/show_ticket_log.tpl b/code/web/public_php/ams/templates/show_ticket_log.tpl
index f7d065306..45e0475ff 100644
--- a/code/web/public_php/ams/templates/show_ticket_log.tpl
+++ b/code/web/public_php/ams/templates/show_ticket_log.tpl
@@ -3,10 +3,6 @@
     <div class="box span12">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-tag"></i> Log of Ticket #{$ticket_id}</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -18,7 +14,7 @@
 				    <th>Timestamp</th>
 				    <th>Query</th>
 			    </tr>
-		    </thead>   
+		    </thead>
 		    <tbody>
 			  {foreach from=$ticket_logs item=log}
 			  <tr>
@@ -27,12 +23,11 @@
 				<td>{$log.query}</td>
 			  </tr>
 			  {/foreach}
-	  
+
 		    </tbody>
-	    </table>            
+	    </table>
 	    </div>
 	</div>
     </div><!--/span-->
 </div><!--/row-->
 {/block}
-	
\ No newline at end of file
diff --git a/code/web/public_php/ams/templates/show_user.tpl b/code/web/public_php/ams/templates/show_user.tpl
index 91bdc683f..f4835a515 100644
--- a/code/web/public_php/ams/templates/show_user.tpl
+++ b/code/web/public_php/ams/templates/show_user.tpl
@@ -3,10 +3,6 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-user"></i> Profile of {$target_name}</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -15,33 +11,33 @@
 		    <tbody>
 			<tr >
 			    <td><strong>Email:</strong></td>
-			    <td>{$mail}</td>                           
+			    <td>{$mail}</td>
 			</tr>
-			
+
 			<tr >
 			    <td><strong>Role:</strong></td>
 			    <td>
 			    {if $userPermission eq 1}<span class="label label-success">User</span>{/if}
 			    {if $userPermission eq 2}<span class="label label-warning">Moderator</span>{/if}
 			    {if $userPermission eq 3}<span class="label label-important">Admin</span>{/if}
-			    </td>                           
+			    </td>
 			</tr>
 			{if $firstName neq ""}
 			<tr>
 			    <td><strong>Firstname:</strong></td>
-			    <td>{$firstName}</td>                           
+			    <td>{$firstName}</td>
 			</tr>
 			{/if}
 			{if $lastName neq ""}
 			<tr>
 			    <td><strong>LastName:</strong></td>
-			    <td>{$lastName}</td>                           
+			    <td>{$lastName}</td>
 			</tr>
 			{/if}
 			{if $country neq ""}
 			<tr>
 			    <td><strong>Country:</strong></td>
-			    <td>{$country}</td>                           
+			    <td>{$country}</td>
 			</tr>
 			{/if}
 			{if $gender neq 0}
@@ -56,17 +52,13 @@
 			{/if}
 		    </tbody>
 		</table>
-	    </div>                   
+	    </div>
         </div>
     </div><!--/span-->
-    
+
     <div class="box span3">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-th"></i>Actions</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -90,10 +82,10 @@
 			{/if}
 			<li class="divider"></li>
 		    {/if}
-		    
+
                 </ul>
               </div>
-            </div>                   
+            </div>
         </div>
     </div><!--/span-->
 </div><!--/row-->
@@ -102,10 +94,6 @@
     <div class="box span9">
         <div class="box-header well" data-original-title="">
             <h2><i class="icon-tag"></i> Tickets of {$target_name}</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
         </div>
         <div class="box-content">
             <div class="row-fluid">
@@ -119,7 +107,7 @@
 				    <th>Category</th>
 				    <th>Status</th>
 			    </tr>
-		    </thead>   
+		    </thead>
 		    <tbody>
 			  {foreach from=$ticketlist item=ticket}
 			  <tr>
@@ -128,15 +116,15 @@
 				<td class="center"><i>{$ticket.timestamp}</i></td>
 				<td class="center">{$ticket.category}</td>
 
-				<td class="center"><span class="label {if $ticket.status eq 0}label-success{else if $ticket.status eq 1}label-warning{else if $ticket.status eq 2}label-important{/if}">{if $ticket.status eq 0} <i class="icon-exclamation-sign icon-white"></i>{/if} {$ticket.statusText}</span></td>  
+				<td class="center"><span class="label {if $ticket.status eq 0}label-success{else if $ticket.status eq 1}label-warning{else if $ticket.status eq 2}label-important{/if}">{if $ticket.status eq 0} <i class="icon-exclamation-sign icon-white"></i>{/if} {$ticket.statusText}</span></td>
 			  </tr>
 			  {/foreach}
-	  
+
 		    </tbody>
-	    </table>            
+	    </table>
 	    </div>
 	</div>
     </div><!--/span-->
 </div><!--/row-->
 {/block}
-	
+
diff --git a/code/web/public_php/ams/templates/syncing.tpl b/code/web/public_php/ams/templates/syncing.tpl
index 56bd0cca3..3b6fa244e 100644
--- a/code/web/public_php/ams/templates/syncing.tpl
+++ b/code/web/public_php/ams/templates/syncing.tpl
@@ -1,15 +1,9 @@
 {block name=content}
-	
+
 	<div class="row-fluid">
 		<div class="box span12">
 			<div class="box-header well">
 				<h2><i class="icon-info-sign"></i>{$syncing_title}</h2>
-				<div class="box-icon">
-					<a href="#" class="btn btn-round" onclick="javascript:show_help('intro');return false;"><i class="icon-info-sign"></i></a>
-					<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-				</div>
 			</div>
 			<div class="box-content">
 				<center>
@@ -35,15 +29,10 @@
 			</div>
 		</div>
 	</div>
-			<div class="row-fluid sortable">		
+			<div class="row-fluid sortable">
 				<div class="box span12">
 					<div class="box-header well" data-original-title>
 						<h2><i class="icon-user"></i> {$members}</h2>
-						<div class="box-icon">
-							<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-							<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-						</div>
 					</div>
 					<div class="box-content">
 						<table class="table table-striped table-bordered">
@@ -52,17 +41,17 @@
 								  <th>{$id}</th>
 								  <th>{$type}</th>
 							  </tr>
-						  </thead>   
+						  </thead>
 						  <tbody>
 							{foreach from=$liblist item=element}
 							<tr>
 								<td>{$element.id}</td>
 								<td class="center">{$element.type}</td>
-								
-								
+
+
 							</tr>
 							{/foreach}
-					
+
 						  </tbody>
 					  </table>
 						<div style="width: 300px; margin:0px auto;">
@@ -76,7 +65,7 @@
 						</div>
 					</div>
 				</div><!--/span-->
-			
+
 			</div><!--/row-->
 {/block}
 
diff --git a/code/web/public_php/ams/templates/userlist.tpl b/code/web/public_php/ams/templates/userlist.tpl
index 4dbdd77fb..c6732c144 100644
--- a/code/web/public_php/ams/templates/userlist.tpl
+++ b/code/web/public_php/ams/templates/userlist.tpl
@@ -1,13 +1,8 @@
 {block name=content}
-<div class="row-fluid">		
+<div class="row-fluid">
 				<div class="box span12">
 					<div class="box-header well" data-original-title>
 						<h2><i class="icon-user"></i> Members</h2>
-						<div class="box-icon">
-							<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
-							<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-							<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-						</div>
 					</div>
 					<div class="box-content">
 						<table class="table table-striped table-bordered">
@@ -19,7 +14,7 @@
 								  <th>Permission</th>
 								  <th>Action</th>
 							  </tr>
-						  </thead>   
+						  </thead>
 						  <tbody>
 							{foreach from=$userlist item=element}
 							<tr>
@@ -53,14 +48,14 @@
 										{/if}
 										<li class="divider"></li>
 									</ul>
-									 
+
 								      </div>
 									{/if}
 								</td>
-								
+
 							</tr>
 							{/foreach}
-					
+
 						  </tbody>
 					  </table>
 					  <div style="width: 300px; margin:0px auto;">
@@ -74,7 +69,7 @@
 					  </div>
 					</div>
 				</div><!--/span-->
-			
+
 			</div><!--/row-->
 {/block}