diff --git a/e107_admin/image.php b/e107_admin/image.php
index 0b77f9f54..5959d0233 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -9,8 +9,8 @@
  * Image Administration Area
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
- * $Revision: 1.15 $
- * $Date: 2008-12-11 22:09:11 $
+ * $Revision: 1.16 $
+ * $Date: 2008-12-12 09:55:33 $
  * $Author: secretr $
  *
 */
@@ -179,7 +179,7 @@ if (isset($_POST['submit_avdelete_multi']))
 
 		$emessage->add(IMALAN_51.'<strong>'.implode(', ', $tmp).'</strong> '.IMALAN_28, E_MESSAGE_SUCCESS);
 		$admin_log->log_event('IMALAN_03', implode('[!br!]', $avList), E_LOG_INFORMATIVE, '');
-		
+
 		unset($search_users);
 	}
 	unset($avList, $tmp, $uids);
@@ -248,16 +248,9 @@ if (isset($_POST['show_avatars']))
 			$disabled = '';
 			if ($sql->db_Select("user", "*", "user_image='-upload-".$tp->toDB($image_name)."' OR user_sess='".$tp->toDB($image_name)."'"))
 			{
-				/*
-				//Is it possible?! I don't think so
-				while ($row = $sql->db_Fetch())
-				{
-					extract($row); // kill this!!!
-					$users .= "<a href='".e_BASE."user.php?id.$user_id'>$user_name</a> <span class='smalltext'>(".($user_sess == $image_name ? IMALAN_24 : IMALAN_23).")</span> | ";
-				}*/
 				$row = $sql->db_Fetch();
 				if($row['user_image'] == '-upload-'.$image_name) $image_pre = '-upload-';
-				$users .= "<a href='".e_BASE."user.php?id.{$row['user_id']}'>{$row['user_name']}</a> <span class='smalltext'>(".($row['user_sess'] == $image_name ? IMALAN_24 : IMALAN_23).")</span>";
+				$users .= "<a href='".$e107->url->getUrl('core:user', 'main', 'func=profile&id='.$row['user_id'])."'>{$row['user_name']}</a> <span class='smalltext'>(".($row['user_sess'] == $image_name ? IMALAN_24 : IMALAN_23).")</span>";
 			} else {
 				$users = '<span class="warning">'.IMALAN_22.'</span>';
 			}
@@ -643,10 +636,10 @@ if(!e_AJAX_REQUEST) require_once("footer.php");
 function headerjs()
 {
 	require_once(e_HANDLER.'js_helper.php');
-	//FIXME - how exactly to call JS lan?
+	//FIXME - how exactly to auto-call JS lan? This and more should be solved in Stage II.
 	$ret = "
 		<script type='text/javascript'>
-			//add required core lan
+			//add required core lan - delete confirm message
 			(".e_jshelper::toString(IMALAN_67).").addModLan('core', 'delete_confirm');
 		</script>
 		<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php
index c464487d3..7cf2efef0 100644
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -9,8 +9,8 @@
  * Message Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $
- * $Revision: 1.5 $
- * $Date: 2008-12-11 22:09:11 $
+ * $Revision: 1.6 $
+ * $Date: 2008-12-12 09:55:33 $
  * $Author: secretr $
  *
 */
@@ -177,7 +177,7 @@ class eMessage
 			$message = $this->get($type, $raw);
 			if(!empty($message))
 			{
-				$ret[$type] = (true === $raw) ? $message : eMessage::formatMessage($type, $message);
+				$ret[$type] = $message;
 			}
 		}
 
@@ -206,14 +206,14 @@ class eMessage
 		if (empty($message)) return '';
 		elseif (is_array($message))
 		{
-			$message = "<div class='message-item'>\n".implode("</div>\n<div class='message-item'>", $message)."</div>";
+			$message = "<div class='message-item'>".implode("</div>\n<div class='message-item'>", $message)."</div>";
 		}
 		return "
 			<div class='{$type}'>
 				<div class='message-title'>".eMessage::getTitle($type)."</div>
 				<div class='message-body'>
 					{$message}
-				<div>
+				</div>
 			</div>
 		";
 	}
@@ -277,7 +277,7 @@ class eMessage
 	{
 		return (array_key_exists($type, $this->_type_map()));
 	}
-	
+
 	/**
 	 * Check for messages
 	 *
diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php
index 6b6655093..8059767ce 100644
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -1,20 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2008-12-10 16:59:19 $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2001-2008 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Admin template - _blank theme
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
+ * $Revision: 1.3 $
+ * $Date: 2008-12-12 09:55:33 $
+ * $Author: secretr $
+ *
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -47,20 +45,22 @@ $ADMIN_HEADER = "
 					<div class='col-main'>
 						<div class='inner-wrapper'>
 ";
-
+/*
+	{SETSTYLE=admin_menu}
+	<!--
+	{ADMIN_NAV}
+	-->
+ */
 $ADMIN_FOOTER = "
 						</div>
 					</div>
 				</td>
 				<td class='col-right'>
 					<div class='col-right'>
-						{SETSTYLE=admin_menu}
-						<!--
-						{ADMIN_NAV}
-						-->
+
 						{SETSTYLE=admin_menu}
 						{ADMIN_MENU}
-						
+
 						{SETSTYLE=none}
 						{ADMIN_LANG}
 						{ADMIN_PWORD}
@@ -69,7 +69,7 @@ $ADMIN_FOOTER = "
 						{ADMIN_LOG=request}
 						{ADMIN_MSG}
 						{ADMIN_PLUGINS}
-						
+
 						{ADMIN_PRESET}
 						{ADMIN_UPDATE}
 						{SETSTYLE=site_info}
@@ -107,7 +107,7 @@ $BUTTON_OVER = '
 	</li>
 ';
 $SUB_BUTTONS_START = '
-<ul class="plugin-navigation">	
+<ul class="plugin-navigation">
 	<li>
 		<a class="link" onclick="expandit(\'{SUB_HEAD_ID}\');" >&raquo;&nbsp;{SUB_HEAD}</a>
 		<ul class="sub-nav" id="{SUB_HEAD_ID}" style="display: none">