diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/smarty3/admin_users.tpl
new file mode 100644
index 0000000000..d7a7ef2ca0
--- /dev/null
+++ b/view/theme/frost-mobile/smarty3/admin_users.tpl
@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/smarty3/jot.tpl
index c7656fb8a6..98dd7b3a9f 100644
--- a/view/theme/frost-mobile/smarty3/jot.tpl
+++ b/view/theme/frost-mobile/smarty3/jot.tpl
@@ -28,6 +28,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
 	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
 		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
 	</div> 
@@ -64,10 +68,6 @@
   	{{$jotplugins}}
 	</div>
 
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
 	<div id="jot-preview-content" style="display:none;"></div>
 
 	<div style="display: none;">
@@ -75,8 +75,8 @@
 			{{$acl}}
 			<hr style="clear:both"/>
 			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
 			{{$jotnets}}
+			<div id="profile-jot-networks-end"></div>
 		</div>
 	</div>
 
diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/smarty3/admin_users.tpl
new file mode 100644
index 0000000000..d7a7ef2ca0
--- /dev/null
+++ b/view/theme/frost/smarty3/admin_users.tpl
@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/smarty3/contacts-template.tpl
index 3a25475968..6d76f9e0da 100644
--- a/view/theme/frost/smarty3/contacts-template.tpl
+++ b/view/theme/frost/smarty3/contacts-template.tpl
@@ -2,6 +2,8 @@
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
 
+{{$tabs}}
+
 <div id="contacts-search-wrapper">
 <form id="contacts-search-form" action="{{$cmd}}" method="get" >
 <span class="contacts-search-desc">{{$desc}}</span>
@@ -11,8 +13,6 @@
 </div>
 <div id="contacts-search-end"></div>
 
-{{$tabs}}
-
 
 <div id="contacts-display-wrapper">
 {{foreach $contacts as $c}}
diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/smarty3/jot.tpl
index 119f0d21ee..0639d4e67a 100644
--- a/view/theme/frost/smarty3/jot.tpl
+++ b/view/theme/frost/smarty3/jot.tpl
@@ -27,6 +27,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
 	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
 		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
 	</div> 
@@ -65,10 +69,6 @@
 
 <!--	<span id="jot-display-location" style="display: none;"></span>-->
 
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-	</div> 
-	
 	<div id="jot-preview-content" style="display:none;"></div>
 
 	<div style="display: none;">
diff --git a/view/theme/frost/smarty3/msg-header.tpl b/view/theme/frost/smarty3/msg-header.tpl
index 760d2ad463..bc85fa13ef 100644
--- a/view/theme/frost/smarty3/msg-header.tpl
+++ b/view/theme/frost/smarty3/msg-header.tpl
@@ -2,7 +2,8 @@
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";
-	var plaintext = "{{$editselect}}";
+	var none = "none";	// ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = {{$editselect}};
 	window.ajaxType = 'msg-header';
 	window.autocompleteType = 'msg-header';
 </script>
diff --git a/view/theme/frost/smarty3/nav.tpl b/view/theme/frost/smarty3/nav.tpl
index 6b1d64fee6..9196c94d62 100644
--- a/view/theme/frost/smarty3/nav.tpl
+++ b/view/theme/frost/smarty3/nav.tpl
@@ -7,10 +7,10 @@
 
 <!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-	<a class="system-menu-link nav-link" href="{{$nav.settings.0}}" title="Main Menu">
+	<a class="system-menu-link nav-link nav-menu-icon" href="{{$nav.settings.0}}" title="Main Menu" point="#system-menu-list">
 	<img class="system-menu-link" src="{{$baseurl}}/view/theme/frost/images/menu.png">
 	</a>
-	<ul id="system-menu-list" class="nav-menu-list">
+	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
 		{{if $nav.login}}
 		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
 		{{/if}}
@@ -70,13 +70,15 @@
 
 <!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-	<a class="contacts-menu-link nav-link" href="{{$nav.contacts.0}}" title="Contacts">
+	<a class="contacts-menu-link nav-link nav-menu-icon" href="{{$nav.contacts.0}}" title="Contacts" point="#contacts-menu-list">
 	<img class="contacts-menu-link" src="{{$baseurl}}/view/theme/frost/images/contacts.png">
 	</a>
 	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
 	<span id="intro-update" class="nav-ajax-left"></span>
+	</a>
 	{{/if}}
-	<ul id="contacts-menu-list" class="nav-menu-list">
+	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
 		{{if $nav.contacts}}
 		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
 		{{/if}}
@@ -103,13 +105,13 @@
 
 <!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-	<a class="network-menu-link nav-link" href="{{$nav.network.0}}" title="Network">
+	<a class="nav-menu-icon network-menu-link nav-link" href="{{$nav.network.0}}" title="Network" point="#network-menu-list">
 	<img class="network-menu-link" src="{{$baseurl}}/view/theme/frost/images/network.png">
 	</a>
 	{{if $nav.network}}
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{/if}}
-	<ul id="network-menu-list" class="nav-menu-list">
+	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
 		{{if $nav.network}}
 		<li>
 		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
@@ -129,7 +131,7 @@
 		{{/if}}
 	</ul>
 	</div>
-		
+
 	{{if $nav.network}}
 	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
 	<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">
diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/smarty3/threaded_conversation.tpl
index 6bf8e8e4dd..680a201eef 100644
--- a/view/theme/frost/smarty3/threaded_conversation.tpl
+++ b/view/theme/frost/smarty3/threaded_conversation.tpl
@@ -4,6 +4,10 @@
   <div id="item-delete-selected-top-desc" >{{$dropping}}</div>
 </div>
 <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{else}}
+{{if $mode==display}}
+<div id="display-top-padding"></div>
+{{/if}}
 {{/if}}
 
 {{$live_update}}
diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/smarty3/wall_thread.tpl
index 5d0e51c657..a0c576b18b 100644
--- a/view/theme/frost/smarty3/wall_thread.tpl
+++ b/view/theme/frost/smarty3/wall_thread.tpl
@@ -40,7 +40,7 @@
 		</div>
 		<!--<div class="wall-item-author">-->
 				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" >{{$item.ago}}</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></div>
 		<!--</div>-->
 		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>