diff --git a/CHANGELOG.md b/CHANGELOG.md
index 206849217..fc15bc46f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@
 - search.php parameter sanitizing [\#1213](https://github.com/torrentpier/torrentpier/pull/1213) ([kovalensky](https://github.com/kovalensky), [belomaxorka](https://github.com/belomaxorka))
 - Limit execution time for forum file-listing [\#1211](https://github.com/torrentpier/torrentpier/pull/1211) ([kovalensky](https://github.com/kovalensky), [belomaxorka](https://github.com/belomaxorka))
 - Some reported bugfixes [\#1214](https://github.com/torrentpier/torrentpier/pull/1214) ([belomaxorka](https://github.com/belomaxorka))
-- Minor improvements [\#1215](https://github.com/torrentpier/torrentpier/pull/1215), [\#1217](https://github.com/torrentpier/torrentpier/pull/1217), [\#1219](https://github.com/torrentpier/torrentpier/pull/1219), [\#1220](https://github.com/torrentpier/torrentpier/pull/1220), [\#1224](https://github.com/torrentpier/torrentpier/pull/1224), [\#1228](https://github.com/torrentpier/torrentpier/pull/1228), [\#1229](https://github.com/torrentpier/torrentpier/pull/1229) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#1215](https://github.com/torrentpier/torrentpier/pull/1215), [\#1217](https://github.com/torrentpier/torrentpier/pull/1217), [\#1219](https://github.com/torrentpier/torrentpier/pull/1219), [\#1220](https://github.com/torrentpier/torrentpier/pull/1220), [\#1224](https://github.com/torrentpier/torrentpier/pull/1224), [\#1228](https://github.com/torrentpier/torrentpier/pull/1228), [\#1229](https://github.com/torrentpier/torrentpier/pull/1229), [\#1230](https://github.com/torrentpier/torrentpier/pull/1230) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed extensions issue [\#1218](https://github.com/torrentpier/torrentpier/pull/1218) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed broken sorting in group.php [\#1221](https://github.com/torrentpier/torrentpier/pull/1221) ([belomaxorka](https://github.com/belomaxorka))
 - Code re-formatting [\#1225](https://github.com/torrentpier/torrentpier/pull/1225) ([kovalensky](https://github.com/kovalensky))
diff --git a/styles/templates/default/viewtopic_attach.tpl b/styles/templates/default/viewtopic_attach.tpl
index 3f24847e1..08d9e231e 100644
--- a/styles/templates/default/viewtopic_attach.tpl
+++ b/styles/templates/default/viewtopic_attach.tpl
@@ -91,35 +91,36 @@
 		<td colspan="3">{postrow.attach.tor_not_reged.comment.COMMENT}</td>
 	</tr>
 	<!-- END comment -->
-	<tr class="row3 tCenter">
-		<td colspan="3">&nbsp;
-		<script type="text/javascript">
-		ajax.callback.change_torrent = function(data) {
-		    if(data.title) alert(data.title);
-		    if(data.url) document.location.href = data.url;
-		};
-		</script>
-		<!-- IF TOR_CONTROLS -->
-		<script type="text/javascript">
-		function change_torrents()
-		{
-			ajax.exec({
-				action    : 'change_torrent',
-				attach_id : {postrow.attach.tor_not_reged.ATTACH_ID},
-				type      : $('#tor-select-{postrow.attach.tor_not_reged.ATTACH_ID}').val(),
-			});
-		}
-		</script>
-			<select name="tor_action" id="tor-select-{postrow.attach.tor_not_reged.ATTACH_ID}" onchange="$('#tor-confirm-{postrow.attach.tor_not_reged.ATTACH_ID}').attr('checked', false); $('#tor-submit-{postrow.attach.tor_not_reged.ATTACH_ID}').attr('disabled', true)">
-				<option value="" selected class="select-action">&raquo; {L_SELECT_ACTION}</option>
-				<option value="del_torrent">{L_DELETE_TORRENT}</option>
-				<option value="del_torrent_move_topic">{L_DELETE_MOVE_TORRENT}</option>
-			</select>
-
-			&nbsp; <a href="#" onclick="change_torrents($('#tor-{postrow.attach.tor_reged.ATTACH_ID} select').val()); return false;"><input type="submit" value="{L_SUBMIT}" class="liteoption" /></a>
-		<!-- ENDIF -->
-		&nbsp;</td>
-	</tr>
+    <!-- IF TOR_CONTROLS -->
+    <tr class="row3 tCenter">
+        <td colspan="3">
+            <script type="text/javascript">
+                ajax.callback.change_torrent = function (data) {
+                    if (data.title) alert(data.title);
+                    if (data.url) document.location.href = data.url;
+                };
+            </script>
+            <script type="text/javascript">
+                function change_torrents() {
+                    ajax.exec({
+                        action: 'change_torrent',
+                        attach_id: {postrow.attach.tor_not_reged.ATTACH_ID},
+                        type: $('#tor-select-{postrow.attach.tor_not_reged.ATTACH_ID}').val(),
+                    });
+                }
+            </script>
+            <select name="tor_action" id="tor-select-{postrow.attach.tor_not_reged.ATTACH_ID}"
+                    onchange="$('#tor-confirm-{postrow.attach.tor_not_reged.ATTACH_ID}').attr('checked', false); $('#tor-submit-{postrow.attach.tor_not_reged.ATTACH_ID}').attr('disabled', true);">
+                <option value="" selected class="select-action">&raquo; {L_SELECT_ACTION}</option>
+                <option value="del_torrent">{L_DELETE_TORRENT}</option>
+                <option value="del_torrent_move_topic">{L_DELETE_MOVE_TORRENT}</option>
+            </select>
+            <a href="#"
+               onclick="change_torrents($('#tor-{postrow.attach.tor_reged.ATTACH_ID} select').val()); return false;"><input
+                    type="submit" value="{L_SUBMIT}" class="liteoption"/></a>
+        </td>
+    </tr>
+    <!-- ENDIF -->
 </table>
 
 <div class="spacer_12"></div>
@@ -230,6 +231,7 @@
         <td colspan="3">{postrow.attach.tor_reged.comment.COMMENT}</td>
     </tr>
     <!-- END comment -->
+    <!-- IF TOR_CONTROLS -->
     <tr class="row3 tCenter">
         <td colspan="3">
             <script type="text/javascript">
@@ -238,7 +240,6 @@
                     if (data.url) document.location.href = data.url;
                 };
             </script>
-            <!-- IF TOR_CONTROLS -->
             <script type="text/javascript">
                 function change_torrents() {
                     ajax.exec({
@@ -271,9 +272,9 @@
             <a href="#"
                onclick="change_torrents($('#tor-{postrow.attach.tor_reged.ATTACH_ID} select').val()); return false;"><input
                     type="submit" value="{L_EDIT}" class="liteoption"/></a>
-            <!-- ENDIF -->
         </td>
     </tr>
+    <!-- ENDIF -->
     <!-- IF TOR_HELP_LINKS -->
     <tr class="row3 tCenter">
         <td colspan="3">{TOR_HELP_LINKS}</td>