diff --git a/upload/ajax/edit_user_profile.php b/upload/ajax/edit_user_profile.php
index 640f8d548..5c1c009cc 100644
--- a/upload/ajax/edit_user_profile.php
+++ b/upload/ajax/edit_user_profile.php
@@ -131,10 +131,7 @@ switch ($field)
 	case 'u_down_total':
 	case 'u_up_release':
 	case 'u_up_bonus':
-		if (!IS_SUPER_ADMIN)
-		{
-			$this->ajax_die($lang['ONLY_FOR_SUPER_ADMIN']);
-		}
+		if (!IS_ADMIN) $this->ajax_die($lang['NOT_ADMIN']);
 
 		$table = BB_BT_USERS;
 		$value = (float) str_replace(',', '.', $this->request['value']);
diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php
index 7ea5955d5..4041220d3 100644
--- a/upload/includes/page_header.php
+++ b/upload/includes/page_header.php
@@ -1,12 +1,10 @@
 <?php
 
 if (!defined('BB_ROOT')) die(basename(__FILE__));
+if (defined('PAGE_HEADER_SENT')) return;
 
 // Parse and show the overall page header
 
-if (!defined('BB_ROOT')) die(basename(__FILE__));
-if (defined('PAGE_HEADER_SENT')) return;
-
 global $page_cfg, $userdata, $user, $ads, $bb_cfg, $template, $lang, $images;
 
 $logged_in = (int) !empty($userdata['session_logged_in']);
@@ -211,7 +209,7 @@ $template->assign_vars(array(
 	'AUTOLOGIN_DISABLED' => !$bb_cfg['allow_autologin'],
 	'S_LOGIN_ACTION'     => BB_ROOT ."login.php",
 
-	'U_CUR_DOWNLOADS'    => PROFILE_URL . $userdata['user_id'] .'#torrent',
+	'U_CUR_DOWNLOADS'    => PROFILE_URL . $userdata['user_id'],
 	'U_FAQ'              => $bb_cfg['faq_url'],
 	'U_FORUM'            => "viewforum.php",
 	'U_GROUP_CP'         => "groupcp.php",
diff --git a/upload/index.php b/upload/index.php
index 8b6caa461..1b845c6a4 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -194,7 +194,7 @@ if (!$forums_count = count($cat_forums) AND $viewcat)
 
 $template->assign_vars(array(
 	'SHOW_FORUMS'           => $forums_count,
-	'PAGE_TITLE'            => $lang['INDEX'],
+	'PAGE_TITLE'            => $lang['HOME'],
 	'NO_FORUMS_MSG'         => ($only_new) ? $lang['NO_NEW_POSTS'] : $lang['NO_FORUMS'],
 
 	'TOTAL_TOPICS'          => sprintf($lang['POSTED_TOPICS_TOTAL'], $stats['topiccount']),
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 469dc1715..c5abdd098 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -31,7 +31,7 @@ $lang['TIME'] = 'Time';
 $lang['HOURS'] = 'Hours';
 $lang['MESSAGE'] = 'Message';
 $lang['TORRENT'] = 'Torrent';
-$lang['MANAGE'] = 'Profile';
+$lang['PROFILE'] = 'Profile';
 $lang['PERMISSIONS'] = 'Permissions';
 
 $lang['1_DAY'] = '1 Day';
@@ -178,7 +178,6 @@ $lang['USER_WELCOME'] = 'Welcome,';
 //
 // Index page
 //
-$lang['INDEX'] = 'Index';
 $lang['HOME'] = 'Home';
 $lang['NO_POSTS'] = 'No Posts';
 $lang['NO_FORUMS'] = 'This board has no forums';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 09b044a65..f7ecee291 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -36,7 +36,7 @@ $lang['TIME'] = 'Время';
 $lang['HOURS'] = 'Часы';
 $lang['MESSAGE'] = 'Сообщение';
 $lang['TORRENT'] = 'Торрент';
-$lang['MANAGE'] = 'Профиль';
+$lang['PROFILE'] = 'Профиль';
 $lang['PERMISSIONS'] = 'Права доступа';
 
 $lang['1_DAY'] = 'за последний день';
@@ -76,7 +76,7 @@ $lang['VIEW_LATEST_POST'] = 'Посмотреть последнее сообщ
 $lang['VIEW_NEWEST_POST'] = 'Перейти к первому непрочитанному сообщению';
 $lang['PAGE_OF'] = 'Страница <b>%d</b> из <b>%s</b>';
 
-$lang['ICQ'] = 'ICQ Number';
+$lang['ICQ'] = 'ICQ';
 $lang['SKYPE'] = 'Skype';
 $lang['SKYPE_ERROR'] = 'Вы ввели неккоректный логин';
 
@@ -182,7 +182,6 @@ $lang['USER_WELCOME'] = 'Вы зашли как: ';
 //
 // Index page
 //
-$lang['INDEX'] = 'Главная';
 $lang['HOME'] = 'Главная';
 $lang['NO_POSTS'] = 'Нет сообщений';
 $lang['NO_FORUMS'] = 'На этом сайте нет форумов';
diff --git a/upload/misc/html/sidebar1.html b/upload/misc/html/sidebar1.html
index abee8480a..1c7ad9668 100644
--- a/upload/misc/html/sidebar1.html
+++ b/upload/misc/html/sidebar1.html
@@ -4,7 +4,7 @@
 <div>
 	<h3>BitTorrent клиенты</h3>
 	<ul>
-		<li><a href="http://www.utorrent.com/" class="med"><b>uTorrent</b></a> <span class="med nowrap">(рекомендуемый: <b>2.0/2.0.4</b>)</span></li>
+		<li><a href="http://www.utorrent.com/" class="med"><b>uTorrent</b></a> <span class="med nowrap">(рекомендуемый: <b>3.0</b>)</span></li>
 	</ul>
 </div>
 
diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css
index 1165b270d..5a6735860 100644
--- a/upload/templates/default/css/main.css
+++ b/upload/templates/default/css/main.css
@@ -835,7 +835,7 @@ a.tr-dl:visited { color: #5493B4; font-weight: normal; }
 /* ================================================================ *
      Images
  * ================================================================ */
-img.forum_icon  { width: 46px; height: 25px; }
+img.forum_icon  { width: auto; height: auto; }
 img.topic_icon  { width: 19px; height: 18px; }
 img.pm_box_icon { width: 28px; height: 25px; }
 img.icon1       { width: 12px; height: 9px;  }
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl
index 3aa386cb2..949bc540d 100644
--- a/upload/templates/default/index.tpl
+++ b/upload/templates/default/index.tpl
@@ -12,7 +12,7 @@
 <!-- IF LOGGED_IN -->
 <div id="forums_top_links">
 	<div class="floatL">
-		<a href="{U_SEARCH_NEW}" class="med"><b>{L_SEARCH_NEW}</b></a> [{MINIPOST_IMG_NEW}] &#0183;
+		<a href="{U_SEARCH_NEW}" class="med"><b>{L_SEARCH_NEW}</b></a> &#0183;
 		<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT1}</a> &#0183;
 		<a href="{U_SEARCH_LATEST}" class="med">{L_SEARCH_LATEST}</a>
 	</div>
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl
index 8b30574a6..acb2d30ac 100644
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@@ -341,15 +341,16 @@ function OpenInEditor ($file, $line)
             <td width="40%">
          {L_USER_WELCOME} &nbsp;<a href="{U_PROFILE}"><b class="med">{THIS_USERNAME}</b></a>&nbsp; [ <a href="{U_LOGIN_LOGOUT}" onclick="return confirm('{L_CONFIRM_LOGOUT}');">{L_LOGOUT}</a> ]
       </td>
-	<!-- Report -->
+
 	<td align="center" nowrap="nowrap">
 		<!-- BEGIN switch_report_list -->
-		&nbsp;<a href="{U_REPORT_LIST}" class="mainmenu">{REPORT_LIST}</a>  &nbsp;&#0183;
+		<a href="{U_REPORT_LIST}" class="mainmenu">{REPORT_LIST}</a> &#0183;
 		<!-- END switch_report_list -->
 		<!-- BEGIN switch_report_list_new -->
-		&nbsp;<strong><a href="{U_REPORT_LIST}" class="mainmenu">{REPORT_LIST} &#0183; </a></strong>
+		<strong><a href="{U_REPORT_LIST}" class="mainmenu">{REPORT_LIST} &#0183; </a></strong>
 		<!-- END switch_report_list_new -->
-	<!-- Report [END] -->
+    </td>
+	
 	<td style="padding: 2px;">
 	<div>
 	<form id="quick-search" action="" method="post" onsubmit="
@@ -367,52 +368,58 @@ function OpenInEditor ($file, $line)
 	</form>
 	</div>
 	</td>
-      <td width="50%" class="tRight">
-		<!-- Report -->
-		<!-- BEGIN switch_report_general -->
-		<a href="{U_WRITE_REPORT}">{L_WRITE_REPORT}</a> &#0183;
-		<!-- END switch_report_general -->
-		<!-- Report [END] -->
-         <a href="{U_OPTIONS}" style="color:#993300"><b>{L_OPTIONS}</b></a> &#0183;
-		 <a href="{U_CUR_DOWNLOADS}">{L_CUR_DOWNLOADS}</a> <a href="#dls-menu" class="menu-root menu-alt1"><img src="images/menu_open_1.gif" class="menu-alt1" width="9" height="9" align="middle" alt="" /></a> &#0183;
-		 <a href="{U_SEARCH_SELF_BY_LAST}">{L_SEARCH_SELF}</a>
-      </td>
-         </tr>
-   </table>
+    <td width="50%" class="tRight">
+	    <!-- BEGIN switch_report_general -->
+	    <a href="{U_WRITE_REPORT}">{L_WRITE_REPORT}</a> &#0183;
+	    <!-- END switch_report_general -->
+	    <a href="{U_OPTIONS}"><b>{L_OPTIONS}</b></a> &#0183;
+	    <a href="{U_CUR_DOWNLOADS}">{L_PROFILE}</a> <a href="#dls-menu" class="menu-root menu-alt1">&#9660;</a> &#0183;
+	    <a href="{U_SEARCH_SELF_BY_LAST}">{L_SEARCH_SELF}</a>
+    </td>
+        </tr>
+    </table>
 </div>
 <!--/logout-->
-<style type="text/css">
-.menu-a { background: #FFFFFF; border: 1px solid #92A3A4; }
-.menu-a a { background: #EFEFEF; padding: 4px 10px 5px; margin: 1px; display: block; }
-</style>
+
 <div class="menu-sub" id="dls-menu">
-	<div class="menu-a bold nowrap">
-		<a class="med" href="{U_TRACKER}?rid={SESSION_USER_ID}#results">{L_CUR_UPLOADS}</a>
-		<a class="med" href="{U_SEARCH}?dlu={SESSION_USER_ID}&dlc=1">{L_SEARCH_DL_COMPLETE_DOWNLOADS}</a>
-		<a class="med" href="{U_SEARCH}?dlu={SESSION_USER_ID}&dlw=1">{L_SEARCH_DL_WILL_DOWNLOADS}</a>
-	</div>
+<table class="nowrap" cellspacing="1" cellpadding="4">
+<tr>
+    <th>&nbsp;</th>
+</tr>
+<tr>
+	<td>
+		<fieldset id="show-only">
+		<legend>{L_SEARCH}</legend>
+			<div class="bold nowrap pad_2">
+				<p class="mrg_4"><a class="med" href="{U_TRACKER}?rid={SESSION_USER_ID}#results">{L_CUR_UPLOADS}</a></p>
+				<p class="mrg_4"><a class="med" href="{U_CUR_DOWNLOADS}#torrent">{L_CUR_DOWNLOADS}</a></p>
+				<p class="mrg_4"><a class="med" href="{U_SEARCH}?dlu={SESSION_USER_ID}&dlc=1">{L_SEARCH_DL_COMPLETE_DOWNLOADS}</a></p>
+		        <p class="mrg_4"><a class="med" href="{U_SEARCH}?dlu={SESSION_USER_ID}&dlw=1">{L_SEARCH_DL_WILL_DOWNLOADS}</a></p>
+			</div>
+		</fieldset>
+	</td>
+</tr>
+</table>
 </div>
+
 <!-- ELSE -->
 
 <!--login form-->
 <div class="topmenu">
    <table width="100%" cellpadding="0" cellspacing="0">
    <tr>
-
-            <td class="tCenter pad_2">
-         <a href="{U_REGISTER}" id="register_link"><b>{L_REGISTER}</b></a>
-         &nbsp;&#0183;&nbsp;
-         <form action="{S_LOGIN_ACTION}" method="post">
-            {L_USERNAME}: <input type="text" name="login_username" size="12" tabindex="1" accesskey="l" />
-            {L_PASSWORD}: <input type="password" name="login_password" size="12" tabindex="2" />
-            <label title="{L_AUTO_LOGIN}"><input type="checkbox" name="autologin" value="1" tabindex="3" /> {L_REMEMBER}</label>&nbsp;
-            <input type="submit" name="login" value="{L_LOGIN}" tabindex="4" />
-         </form>
-         &nbsp;&#0183;&nbsp;
-         <a href="{U_SEND_PASSWORD}">{L_FORGOTTEN_PASSWORD}</a>
-      </td>
-         </tr>
-   </table>
+        <td class="tCenter pad_2">
+            <a href="{U_REGISTER}" id="register_link"><b>{L_REGISTER}</b></a> &#0183; 
+                <form action="{S_LOGIN_ACTION}" method="post">
+                    {L_USERNAME}: <input type="text" name="login_username" size="12" tabindex="1" accesskey="l" />
+                    {L_PASSWORD}: <input type="password" name="login_password" size="12" tabindex="2" />
+                    <label title="{L_AUTO_LOGIN}"><input type="checkbox" name="autologin" value="1" tabindex="3" />{L_REMEMBER}</label>&nbsp;
+                    <input type="submit" name="login" value="{L_LOGIN}" tabindex="4" />
+                </form> &#0183; 
+            <a href="{U_SEND_PASSWORD}">{L_FORGOTTEN_PASSWORD}</a>
+        </td>
+    </tr>
+    </table>
 </div>
 
 <!--/login form-->
diff --git a/upload/templates/default/report_open_body.tpl b/upload/templates/default/report_open_body.tpl
index 2f8514aa0..3befaa304 100644
--- a/upload/templates/default/report_open_body.tpl
+++ b/upload/templates/default/report_open_body.tpl
@@ -40,7 +40,7 @@ function checked_toggle(form, status)
 
 <table cellpadding="2" cellspacing="2" border="0" width="80%" align="center">
 	<tr> 
-		<td class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
+		<td class="nav"><a href="{U_INDEX}" class="nav">{L_HOME}</a></td>
 	</tr>
 </table>
 
diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl
index 2a2315f38..73aedb077 100644
--- a/upload/templates/default/usercp_viewprofile.tpl
+++ b/upload/templates/default/usercp_viewprofile.tpl
@@ -100,7 +100,15 @@ $(document).ready(function(){
 
 <h1 class="pagetitle">{L_VIEWING_PROFILE}</h1>
 
-<p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
+<div class="nav">
+	<p class="floatL"><a href="{U_INDEX}">{T_INDEX}</a></p>
+	<!-- IF IS_ADMIN -->
+	<p class="floatR">
+	<a href="{U_MANAGE}">{L_PROFILE}</a> &middot; 
+	<a href="{U_PERMISSIONS}">{L_PERMISSIONS}</a>&nbsp;</p>
+	<!-- ENDIF -->
+	<div class="clear"></div>
+</div>
 
 <table class="user_profile bordered w100" cellpadding="0" border=1>
 <tr>
@@ -168,13 +176,13 @@ $(document).ready(function(){
 			<style type="text/css"> #user-opt label { display: block; } </style>
 			<legend>Юзеру <b style="color: darkred;">ЗАПРЕЩЕНО</b></legend>
 			<div class="tLeft" style="padding: 2px 6px 6px; display: block;">
-				<label><input type="checkbox" name="allow_avatar"     />показывать аватар</label>
-				<label><input type="checkbox" name="allow_sig"        />показывать подпись</label>
-				<label><input type="checkbox" name="allow_passkey"    />скачивать торренты</label>
-				<label><input type="checkbox" name="allow_pm"         />отправлять лс</label>
-				<label><input type="checkbox" name="allow_post"       />отправлять сообщения</label>
-				<label><input type="checkbox" name="allow_post_edit"  />редактировать сообщения</label>
-				<label><input type="checkbox" name="allow_topic"      />создавать темы</label>
+				<label><input type="checkbox" name="allow_avatar"/>показывать аватар</label>
+				<label><input type="checkbox" name="allow_sig"/>показывать подпись</label>
+				<label><input type="checkbox" name="allow_passkey"/>скачивать торренты</label>
+				<label><input type="checkbox" name="allow_pm"/>отправлять лс</label>
+				<label><input type="checkbox" name="allow_post"/>отправлять сообщения</label>
+				<label><input type="checkbox" name="allow_post_edit"/>редактировать сообщения</label>
+				<label><input type="checkbox" name="allow_topic"/>создавать темы</label>
 			</div>
 			</fieldset>
 			<div id="user-opt-save" class="hidden">
@@ -457,13 +465,15 @@ $(document).ready(function(){
 	<tr class="row2 tCenter">
 		<td colspan="4" class="pad_6">
 			<!-- IF SHOW_SEARCH_DL -->
-				<a href="{U_SEARCH_DL_WILL}">{L_SEARCH_DL_WILL_DOWNLOADS}</a>
+				<a href="{U_SEARCH_DL_WILL}" class="med">{L_SEARCH_DL_WILL_DOWNLOADS}</a>
 				::
-				<a href="{U_SEARCH_DL_DOWN}">{L_SEARCH_DL_DOWN}</a>
+				<a href="{U_SEARCH_DL_DOWN}" class="med">{L_SEARCH_DL_DOWN}</a>
 				::
-				<a href="{U_SEARCH_DL_COMPLETE}">{L_SEARCH_DL_COMPLETE}</a>
+				<a href="{U_SEARCH_DL_COMPLETE}" class="med">{L_SEARCH_DL_COMPLETE}</a>
 				::
-				<a href="{U_SEARCH_DL_CANCEL}">{L_SEARCH_DL_CANCEL}</a>
+				<a href="{U_SEARCH_DL_CANCEL}" class="med">{L_SEARCH_DL_CANCEL}</a>
+			<!-- ELSE -->
+			&nbsp;
 			<!-- ENDIF -->
 		</td>
 	</tr>
@@ -483,14 +493,6 @@ $(document).ready(function(){
 	<br />
 	<!-- ENDIF -->
 
-	<!-- IF SHOW_ADMIN_OPTIONS -->
-	<div class="med tRight">
-			{L_MANAGE_USER}:&nbsp;
-			<a href="{U_MANAGE}">{L_MANAGE}</a>&nbsp;
-			<a href="{U_PERMISSIONS}">{L_PERMISSIONS}</a>
-	</div>
-	<!-- ENDIF -->
-
 	<div class="spacer_6"></div>
 
 	<div id="timezone">