diff --git a/sections/reports/reports.php b/sections/reports/reports.php
index 12bdd113..fb68ca8e 100644
--- a/sections/reports/reports.php
+++ b/sections/reports/reports.php
@@ -55,7 +55,8 @@
 		r.Reason, 
 		r.Status,
 		r.ClaimerID,
-		r.Notes
+        r.Notes,
+        r.ResolverID
 	FROM reports AS r 
 	JOIN users_main AS um ON r.UserID=um.ID
 	WHERE " . $Where . "
@@ -89,7 +90,7 @@
 		?>
 	</div>
 	<?
-	while (list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status, $ClaimerID, $Notes) = $DB->next_record()) {
+	while (list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status, $ClaimerID, $Notes, $ResolverID) = $DB->next_record()) {
 		$Type = $Types[$Short];
 		$Reference = "reports.php?id=" . $ReportID . "#report" . $ReportID;
 		?>
@@ -237,7 +238,15 @@
 						</form>
 					</td>
 				</tr>
-				<? } ?>
+                <? } else { 
+                        $ResolverInfo = Users::user_info($ResolverID);
+                    ?>
+                    <tr>
+                        <td colspan="2">
+                            Resolved By <a href="users.php?id=<?=$ResolverID?>"><?=$ResolverInfo['Username']?></a>
+                        </td>
+                    </tr>
+                <? } ?>
 			</table>
 		</div>
 		<br />
diff --git a/static/functions/lastfm.js b/static/functions/lastfm.js
index 1903ecf0..abc9ad8e 100644
--- a/static/functions/lastfm.js
+++ b/static/functions/lastfm.js
@@ -117,8 +117,8 @@
     }
     
     // Escape ampersands with html code to avoid breaking the search links
-    function escapeAmpHtml(input){
-        return input.replace(/&/g,"&#38;");
+    function escapeHtml(input){
+        return input.replace(/&/g,"&#38;").replace(/</g,"&#60;");
     }
 
     
@@ -171,11 +171,11 @@
                             var k = initialCount;
                             if (a.length < 3) k = a.length;
                             for (var i = 0; i < k; i++) {
-                                sharedArtistsHtml += '<li><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeAmpHtml(a[i]['name']) + '</a></li>'
+                                sharedArtistsHtml += '<li><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeHtml(a[i]['name']) + '</a></li>'
                             }
                             if ( a.length > 3 ){
                                 for (i = 3; i < a.length; i++) {
-                                    sharedArtistsHtml += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeAmpHtml(a[i]['name']) + '</a></li>'
+                                    sharedArtistsHtml += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeHtml(a[i]['name']) + '</a></li>'
                                 }
                                 sharedArtistsHtml += '<li>[<a href="#sharedartists" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
                             }
@@ -215,7 +215,7 @@
                     // Fix Last.fm API returning more than one entry despite limit on certain conditions.
                     if ( typeof(json[0]) === "object" ) json = json[0];
                     html += '<li class="lastfm_essential">Last played: ';
-                    html += '<a href="artist.php?artistname=' + escapeAmpUrl(json['artist']['#text']) + '">' + escapeAmpHtml(json['artist']['#text']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(json['name']) + '">' + escapeAmpHtml(json['name']) + '</a>';
+                    html += '<a href="artist.php?artistname=' + escapeAmpUrl(json['artist']['#text']) + '">' + escapeHtml(json['artist']['#text']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(json['name']) + '">' + escapeHtml(json['name']) + '</a>';
                     html += "</li>";
                     lastPlayedTrack = html;
                 }
@@ -250,11 +250,11 @@
                     var k = initialCount;
                     if (j.length < 3) k = j.length;
                     for (var i = 0; i < k; i++) {
-                        html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>'
+                        html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
                     }
                     if ( j.length>3 ){
                         for (i = 3; i < j.length; i++) {
-                            html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>'
+                            html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
                         }
                         html+= '<li>[<a href="#topartists" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
                     }
@@ -293,11 +293,11 @@
                     var k = initialCount;
                     if (j.length < 3) k = j.length;
                     for (var i = 0; i < k; i++) {
-                        html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>'
+                        html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
                     }
                     if ( j.length>3 ){
                         for (i = 3; i < j.length; i++) {
-                            html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>'
+                            html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
                         }
                         html+= '<li>[<a href="#topalbums" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
                     }
@@ -336,11 +336,11 @@
                     var k = initialCount;
                     if (j.length < 3) k = j.length;
                     for (var i = 0; i < k; i++) {
-                        html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>'
+                        html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
                     }
                     if ( j.length>3 ){
                         for (i = 3; i < j.length; i++) {
-                            html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>'
+                            html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
                         }
                         html+= '<li>[<a href="#toptracks" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
                     }
diff --git a/static/functions/multiformat_uploader.js b/static/functions/multiformat_uploader.js
index 52ba0ea8..8a58a0b6 100644
--- a/static/functions/multiformat_uploader.js
+++ b/static/functions/multiformat_uploader.js
@@ -32,6 +32,7 @@
 		addFormats(row);
 		addBitrates(row);
 		addReleaseDescription(row);
+		$("#post").val("Upload torrents");
 		count++;
 	}
 
@@ -104,9 +105,11 @@
 			$("#add_format").show();
 			filenames.pop();
 			count--;
+			$("#post").val("Upload torrents");
 		}
 		if (count == 1) {
 			$("#remove_format").hide();
+			$("#post").val("Upload torrent");
 		}
 
 	}
diff --git a/static/styles/dark_ambient/style.css b/static/styles/dark_ambient/style.css
index e421625a..30b734bb 100644
--- a/static/styles/dark_ambient/style.css
+++ b/static/styles/dark_ambient/style.css
@@ -194,7 +194,7 @@ input[type="submit"]:active, input[type="button"]:active {
   color: #007dc7 !important;
 }
 
-input[value="Upload torrent"] {
+input[value="Upload torrent"], input[value="Upload torrents"] {
   margin: 15px 0 0 0;
    background-color: #2e2e2e;
    color: a5cce9;
@@ -206,7 +206,7 @@ input[value="Upload torrent"] {
    font-weight: bold;
 }
 
-input[value="Upload torrent"]:active {
+input[value="Upload torrent"],input[value="Upload torrents"]:active {
   color: #f4f4f4 !important;
 }
 
diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css
index 499ea02f..c40ffbcb 100644
--- a/static/styles/proton/style.css
+++ b/static/styles/proton/style.css
@@ -196,7 +196,7 @@ input[type="submit"]:active, input[type="button"]:active {
   color: #007dc7 !important;
 }
 
-input[value="Upload torrent"] {
+input[value="Upload torrent"], input[value="Upload torrents"] {
   margin: 15px 0 0 0;
   background-color: #007dc7;
   color: white;
@@ -207,7 +207,7 @@ input[value="Upload torrent"] {
   border-right: 1px solid #005488;
 }
 
-input[value="Upload torrent"]:active {
+input[value="Upload torrent"],input[value="Upload torrents"]:active {
   color: #f4f4f4 !important;
 }