diff --git a/library/ajax/manage_admin.php b/library/ajax/manage_admin.php
index 2ab460080..02789fcf1 100644
--- a/library/ajax/manage_admin.php
+++ b/library/ajax/manage_admin.php
@@ -13,7 +13,9 @@ if (!defined('IN_AJAX')) {
 
 global $userdata, $lang, $bb_cfg;
 
-$mode = (string)$this->request['mode'];
+if (!$mode = (string)$this->request['mode']) {
+    $this->ajax_die('invalid mode (empty)');
+}
 
 switch ($mode) {
     case 'clear_cache':
diff --git a/library/ajax/manage_user.php b/library/ajax/manage_user.php
index 9d58c832c..c3696d732 100644
--- a/library/ajax/manage_user.php
+++ b/library/ajax/manage_user.php
@@ -13,8 +13,13 @@ if (!defined('IN_AJAX')) {
 
 global $userdata, $lang, $bb_cfg;
 
-$mode = (string)$this->request['mode'];
-$user_id = $this->request['user_id'];
+if (!$mode = (string)$this->request['mode']) {
+    $this->ajax_die('invalid mode (empty)');
+}
+
+if (!$user_id = (int)$this->request['user_id']) {
+    $this->ajax_die($lang['NO_USER_ID_SPECIFIED']);
+}
 
 switch ($mode) {
     case 'delete_profile':
diff --git a/library/ajax/mod_action.php b/library/ajax/mod_action.php
index ff29caeff..4d449e9cb 100644
--- a/library/ajax/mod_action.php
+++ b/library/ajax/mod_action.php
@@ -13,7 +13,9 @@ if (!defined('IN_AJAX')) {
 
 global $userdata, $bb_cfg, $lang, $datastore, $log_action;
 
-$mode = (string)$this->request['mode'];
+if (!$mode = (string)$this->request['mode']) {
+    $this->ajax_die('invalid mode (empty)');
+}
 
 switch ($mode) {
     case 'tor_status':
diff --git a/library/ajax/sitemap.php b/library/ajax/sitemap.php
index 5af1fb19f..3c924a929 100644
--- a/library/ajax/sitemap.php
+++ b/library/ajax/sitemap.php
@@ -13,7 +13,10 @@ if (!defined('IN_AJAX')) {
 
 global $bb_cfg, $lang;
 
-$mode = (string)$this->request['mode'];
+if (!$mode = (string)$this->request['mode']) {
+    $this->ajax_die('invalid mode (empty)');
+}
+
 $map = new TorrentPier\Sitemap();
 $html = '';
 
diff --git a/library/ajax/user_register.php b/library/ajax/user_register.php
index 2638943c7..1baba2474 100644
--- a/library/ajax/user_register.php
+++ b/library/ajax/user_register.php
@@ -13,7 +13,9 @@ if (!defined('IN_AJAX')) {
 
 global $bb_cfg, $lang, $userdata;
 
-$mode = (string)$this->request['mode'];
+if (!$mode = (string)$this->request['mode']) {
+    $this->ajax_die('invalid mode (empty)');
+}
 
 $html = '<img src="./styles/images/good.gif">';
 switch ($mode) {
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index 49435c1b5..1cc5fbcd1 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -13,6 +13,7 @@ if (!defined('BB_ROOT')) {
 
 global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $images;
 
+$tor_status_by_for_all = true;
 $change_peers_bgr_over = true;
 $bgr_class_1 = 'row1';
 $bgr_class_2 = 'row2';
@@ -201,7 +202,7 @@ if ($tor_reged && $tor_info) {
             'TOR_FROZEN' => (!IS_AM) ? (isset($bb_cfg['tor_frozen'][$tor_info['tor_status']]) && !(isset($bb_cfg['tor_frozen_author_download'][$tor_info['tor_status']]) && $userdata['user_id'] == $tor_info['poster_id'])) ? true : '' : '',
             'TOR_STATUS_TEXT' => $lang['TOR_STATUS_NAME'][$tor_info['tor_status']],
             'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor_info['tor_status']],
-            'TOR_STATUS_BY' => ($tor_info['checked_user_id'] && $is_auth['auth_mod']) ? ('<span title="' . bb_date($tor_info['checked_time']) . '"> &middot; ' . profile_url($tor_info) . ' &middot; <i>' . delta_time($tor_info['checked_time']) . $lang['TOR_BACK'] . '</i></span>') : '',
+            'TOR_STATUS_BY' => ($tor_info['checked_user_id'] && ($is_auth['auth_mod'] || $tor_status_by_for_all)) ? ('<span title="' . bb_date($tor_info['checked_time']) . '"> &middot; ' . profile_url($tor_info) . ' &middot; <i>' . delta_time($tor_info['checked_time']) . $lang['TOR_BACK'] . '</i></span>') : '',
             'TOR_STATUS_SELECT' => build_select('sel_status', array_flip($lang['TOR_STATUS_NAME']), TOR_APPROVED),
             'TOR_STATUS_REPLY' => $bb_cfg['tor_comment'] && !IS_GUEST && in_array($tor_info['tor_status'], $bb_cfg['tor_reply']) && $userdata['user_id'] == $tor_info['poster_id'] && $t_data['topic_status'] != TOPIC_LOCKED,
             //end torrent status mod
diff --git a/src/Legacy/Atom.php b/src/Legacy/Atom.php
index 22b13fee2..45a004490 100644
--- a/src/Legacy/Atom.php
+++ b/src/Legacy/Atom.php
@@ -221,7 +221,7 @@ class Atom
             $atom .= "	</author>\n";
             $atom .= "	<updated>" . $date . "T$time+00:00</updated>\n";
             $atom .= "	<id>tag:rto.feed," . $date . ":/t/$topic_id</id>\n";
-            $atom .= "	<link href=\"viewtopic.php?t=$topic_id\" />\n";
+            $atom .= "	<link href=\"" . TOPIC_URL . "$topic_id\" />\n";
             $atom .= "</entry>\n";
         }
         $atom .= "</feed>";
diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl
index e1aa44107..3f984c15b 100644
--- a/styles/templates/default/group_edit.tpl
+++ b/styles/templates/default/group_edit.tpl
@@ -18,75 +18,98 @@
 <p class="nav"><a href="{U_GROUP_URL}">{L_GROUP_RETURN}</a></p>
 
 <table class="forumline pad_4">
-	<col class="row1" width="20%">
-	<col class="row2" width="100%">
-	<tr>
-		<th colspan="2">{L_GROUP_INFORMATION}</th>
-	</tr>
-	<tr>
-		<td>{L_GROUP_NAME}:</td>
-		<td><input type="text" id="group_name" size="80" value="{GROUP_NAME}" onblur="manage_group(this.id, this.value);" /></td>
-	</tr>
-	<tr>
-		<td>{L_GROUP_DESCRIPTION}:</td>
-		<td><div id="preview_description"></div>
-			<p>
-				<textarea cols="80" id="group_description" rows="6">{GROUP_DESCRIPTION}</textarea>
-			</p>
-			<p>
-				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_description').val()});ajax.callback.posts=function(data){$('div#preview_description').html(data.message_html);initPostBBCode('div#preview_description')}">
-				<input type="button" value="{L_SAVE}" onclick="manage_group('group_description',$('textarea#group_description').val())">
-			</p>
-		</td>
-	</tr>
-	<tr>
-		<td>{L_SIGNATURE}:</td>
-		<td><div id="preview_signature"></div>
-			<p>
-				<textarea cols="80" id="group_signature" rows="3">{GROUP_SIGNATURE}</textarea>
-			</p>
-			<p>
-				<input type="button" value="{L_AJAX_PREVIEW}" onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_signature').val()});ajax.callback.posts=function(data){$('div#preview_signature').html(data.message_html);initPostBBCode('div#preview_signature')}">
-				<input type="button" value="{L_SAVE}" onclick="manage_group('group_signature',$('textarea#group_signature').val())">
-			</p>
-		</td>
-	</tr>
-	<tr>
-		<td>{L_GROUP_TYPE}:</td>
-		<td>
-			<p>
-				<label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN}</label> &nbsp;&nbsp;
-				<label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />{L_GROUP_CLOSED}</label> &nbsp;&nbsp;
-				<label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />{L_GROUP_HIDDEN}</label>
-			</p>
-		</td>
-	</tr>
-	<tr>
-		<td>{L_RELEASE_GROUP}:</td>
-		<td>
-			<label><input type="radio" name="release_group" value="1" onclick="manage_group(this.name,this.value)" <!-- IF RELEASE_GROUP -->checked<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
-			<label><input type="radio" name="release_group" value="0" onclick="manage_group(this.name,this.value)" <!-- IF not RELEASE_GROUP -->checked<!-- ENDIF --> />{L_NO}</label>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			{L_AVATAR}: <br /><br />
-			<div id="avatar" align="center">
-				<p>{AVATAR_IMG}</p><br />
-				<p><input type="button" name="delete_avatar" value="{L_DELETE_IMAGE}" onclick="manage_group(this.name,this.value)" /></p>
-			</div>
-		</td>
-		<td valign="top">
-			<div id="avatar_explain" class="med">{AVATAR_EXPLAIN}</div>
-			<!-- IF $bb_cfg['group_avatars']['up_allowed'] -->
-				<br />
-				<form action="{S_GROUP_CONFIG_ACTION}" method="post" enctype="multipart/form-data">
-					{S_HIDDEN_FIELDS}
-					<input type="hidden" name="MAX_FILE_SIZE" value="{$bb_cfg['group_avatars']['max_size']}" />
-					<input type="file" name="avatar" />
-					<input class="mainoption" type="submit" name="submit" value="{L_UPLOAD_AVATAR_FILE}" />
-				</form>
-			<!-- ENDIF -->
-		</td>
-	</tr>
+    <col class="row1" width="20%">
+    <col class="row2" width="100%">
+    <tr>
+        <th colspan="2">{L_GROUP_INFORMATION}</th>
+    </tr>
+    <tr>
+        <td>{L_GROUP_NAME}:</td>
+        <td><input type="text" id="group_name" size="80" value="{GROUP_NAME}"
+                   onblur="manage_group(this.id, this.value);"/></td>
+    </tr>
+    <tr id="preview_description" class="hidden">
+        <td>{L_PREVIEW} ({L_GROUP_DESCRIPTION}):</td>
+        <td>
+            <div class="description genmed"></div>
+        </td>
+    </tr>
+    <tr>
+        <td>{L_GROUP_DESCRIPTION}:</td>
+        <td>
+            <p>
+                <textarea cols="80" id="group_description" rows="6">{GROUP_DESCRIPTION}</textarea>
+            </p>
+            <p>
+                <input type="button" value="{L_AJAX_PREVIEW}"
+                       onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_description').val()}); ajax.callback.posts=function(data) { $('tr#preview_description').show(); $('tr#preview_description').html(data.message_html); initPostBBCode('div.description')}">
+                <input type="button" value="{L_SAVE}"
+                       onclick="manage_group('group_description',$('textarea#group_description').val())">
+            </p>
+        </td>
+    </tr>
+    <tr id="preview_signature" class="hidden">
+        <td>{L_PREVIEW} ({L_SIGNATURE}):</td>
+        <td>
+            <div class="signature"></div>
+        </td>
+    </tr>
+    <tr>
+        <td>{L_SIGNATURE}:</td>
+        <td>
+            <p>
+                <textarea cols="80" id="group_signature" rows="3">{GROUP_SIGNATURE}</textarea>
+            </p>
+            <p>
+                <input type="button" value="{L_AJAX_PREVIEW}"
+                       onclick="ajax.exec({ action: 'posts', type: 'view_message', message: $('textarea#group_signature').val()}); ajax.callback.posts=function(data) { $('tr#preview_signature').show(); $('tr#preview_signature').html(data.message_html); initPostBBCode('div.signature')}">
+                <input type="button" value="{L_SAVE}"
+                       onclick="manage_group('group_signature',$('textarea#group_signature').val())">
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td>{L_GROUP_TYPE}:</td>
+        <td>
+            <p>
+                <label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)"
+                              value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} />{L_GROUP_OPEN}</label> &nbsp;&nbsp;
+                <label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)"
+                              value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} />{L_GROUP_CLOSED}</label> &nbsp;&nbsp;
+                <label><input type="radio" name="group_type" onchange="manage_group(this.name,this.value)"
+                              value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} />{L_GROUP_HIDDEN}</label>
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td>{L_RELEASE_GROUP}:</td>
+        <td>
+            <label><input type="radio" name="release_group" value="1" onclick="manage_group(this.name,this.value)"
+                <!-- IF RELEASE_GROUP -->checked<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
+            <label><input type="radio" name="release_group" value="0" onclick="manage_group(this.name,this.value)"
+                <!-- IF not RELEASE_GROUP -->checked<!-- ENDIF --> />{L_NO}</label>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {L_AVATAR}: <br/><br/>
+            <div id="avatar" align="center">
+                <p>{AVATAR_IMG}</p><br/>
+                <p><input type="button" name="delete_avatar" value="{L_DELETE_IMAGE}"
+                          onclick="manage_group(this.name,this.value)"/></p>
+            </div>
+        </td>
+        <td valign="top">
+            <div id="avatar_explain" class="med">{AVATAR_EXPLAIN}</div>
+            <!-- IF $bb_cfg['group_avatars']['up_allowed'] -->
+            <br/>
+            <form action="{S_GROUP_CONFIG_ACTION}" method="post" enctype="multipart/form-data">
+                {S_HIDDEN_FIELDS}
+                <input type="hidden" name="MAX_FILE_SIZE" value="{$bb_cfg['group_avatars']['max_size']}"/>
+                <input type="file" name="avatar"/>
+                <input class="mainoption" type="submit" name="submit" value="{L_UPLOAD_AVATAR_FILE}"/>
+            </form>
+            <!-- ENDIF -->
+        </td>
+    </tr>
 </table>
diff --git a/styles/templates/default/usercp_bonus.tpl b/styles/templates/default/usercp_bonus.tpl
index 3f62f5f7a..7c18438ca 100644
--- a/styles/templates/default/usercp_bonus.tpl
+++ b/styles/templates/default/usercp_bonus.tpl
@@ -1,4 +1,4 @@
-<span class="maintitle">{PAGE_TITLE}</span>
+<h1 class="pagetitle">{PAGE_TITLE}</h1>
 
 <table width="100%">
 <tr>
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
index 38acc9144..4dcb9034e 100644
--- a/styles/templates/default/usercp_viewprofile.tpl
+++ b/styles/templates/default/usercp_viewprofile.tpl
@@ -438,7 +438,7 @@ ajax.callback.index_data = function(data) {
 			<!-- IF GENDER -->
 			<tr>
 				<th>{L_GENDER}:</th>
-				<td id="user_gender"><span class="editable">{GENDER}</span></td>
+				<td id="user_gender"><b class="editable">{GENDER}</b></td>
 			</tr>
 			<!-- ENDIF -->
 			<!-- IF BIRTHDAY -->