diff --git a/data/interfaces/default/comicdetails.html b/data/interfaces/default/comicdetails.html
index 0d38aafa..017af395 100755
--- a/data/interfaces/default/comicdetails.html
+++ b/data/interfaces/default/comicdetails.html
@@ -328,6 +328,7 @@
                                 </td>
                                 <td id="options">
                                 <a href="#" title="Manual Search" onclick="doAjaxCall('queueit?ComicID=${issue['ComicID']}&IssueID=${issue['IssueID']}&ComicIssue=${issue['Issue_Number']}&ComicYear=${issue['IssueDate']}&mode=want&manualsearch=True',$(this),'table')" data-success="Manually searching for ${comic['ComicName']} #${issue['Issue_Number']}"><img src="interfaces/default/images/search.png" height="25" width="25" /></a>
+<!--
                                 <a class="menu_link_edit" id="choose_specific_download" title="Choose Specific Download" href="javascript:void(0)" onclick="getAvailableDownloads('${issue['IssueID']}')"><i class="fa fa-search"></i><img src="interfaces/default/images/magnifier.png" height="25" width="25" class="highqual" /></a>
                                 <div id="choose_specific_download_dialog" title="Choose a specific download for this issue" style="display:none" class="configtable">
                                 <table class="display" id="downloads_table">
@@ -343,6 +344,7 @@
                                         </tbody>
                                 </table>
                                 </div>
+-->
                                 %if issue['Status'] == 'Skipped' or issue['Status'] == 'Ignored':
                                         <a href="#" title="Mark issue as Wanted" onclick="doAjaxCall('queueit?ComicID=${issue['ComicID']}&IssueID=${issue['IssueID']}&ComicIssue=${issue['Issue_Number']}&ComicYear=${issue['IssueDate']}&mode=want',$(this),'table')" data-success="Issue Marked as Wanted"><img src="interfaces/default/images/wanted_icon.png" height="25" width="25" class="highqual" /></a>
                                 %elif (issue['Status'] == 'Wanted'):
@@ -480,6 +482,7 @@
                                 <td id="aoptions">
                                    <% amode = 'want_ann' %>
                                         <a href="#" title="Manual Search" onclick="doAjaxCall('queueit?ComicID=${annual['ComicID']}&IssueID=${annual['IssueID']}&ComicIssue=${annual['Issue_Number']}&ComicYear=${annual['IssueDate']}&mode=${amode}&manualsearch=True',$(this),'table')" data-success="Manually searching for ${annual['ComicName']} #${annual['Issue_Number']}"><img src="interfaces/default/images/search.png" height="25" width="25" class="highqual" /></a>
+<!--
                                 <a class="menu_link_edit" id="choose_specific_download" title="Choose Specific Download" href="javascript:void(0)" onclick="getAvailableDownloads('${annual['IssueID']}')"><i class="fa fa-search"></i><img src="interfaces/default/images/magnifier.png" height="25" width="25" class="highqual" /></a>
                                 <div id="choose_specific_download_dialog" title="Choose a specific download for this issue" style="display:none" class="configtable">
                                 <table class="display" id="downloads_table">
@@ -495,6 +498,7 @@
                                         </tbody>
                                 </table>
                                 </div>
+-->
                                 %if annual['Status'] == 'Skipped' or annual['Status'] == 'Ignored':
                                         <a href="#" title="Mark annual as Wanted" onclick="doAjaxCall('queueit?ComicID=${annual['ComicID']}&IssueID=${annual['IssueID']}&ComicIssue=${annual['Issue_Number']}&ComicYear=${annual['IssueDate']}&mode=${amode}',$(this),'table')" data-success="Marked ${annual['ReleaseComicName']} #${annual['Issue_Number']} as Wanted"><img src="interfaces/default/images/wanted_icon.png" height="25" width="25" class="highqual" /></a>
                                 %elif (annual['Status'] == 'Wanted'):
diff --git a/data/interfaces/default/manageissues.html b/data/interfaces/default/manageissues.html
index dc933601..4de10870 100755
--- a/data/interfaces/default/manageissues.html
+++ b/data/interfaces/default/manageissues.html
@@ -92,7 +92,7 @@
                                      except:
                                          ahash = None
                                  %>
-                                 %if ahash is not None:
+                                 %if ahash is not None and mylar.CONFIG.AUTO_SNATCH is True:
                                      <a href="#" onclick="doAjaxCall('torrentit?torrent_hash=${ahash}&download=True',$(this),'table')" title="Auto-Snatch torrent file"><span class="ui-icon ui-icon-plus"></span>auto-snatch</a>
                                  %endif
                                 </td>
diff --git a/data/interfaces/default/upcoming.html b/data/interfaces/default/upcoming.html
index efbe10da..31740037 100755
--- a/data/interfaces/default/upcoming.html
+++ b/data/interfaces/default/upcoming.html
@@ -105,6 +105,7 @@
                                 <td id="issuenumber">${issuenumber}</td>
 				<td id="reldate">${issue['IssueDate']}</td>
                                 <td id="options">
+<!--
                                 <a class="menu_link_edit" id="choose_specific_download" title="Choose Specific Download" href="javascript:void(0)" onclick="getAvailableDownloads('${issueid}')"><i class="fa fa-search"></i><img src="interfaces/default/images/magnifier.png" height="25" width="25" class="highqual" /></a>
                                 <div id="choose_specific_download_dialog" title="Choose a specific download for ${adjcomicname} #${issuenumber}" style="display:none" class="configtable">
                                 <table class="display" id="downloads_table">
@@ -120,6 +121,7 @@
                                         </tbody>
                                 </table>
                                 </div>
+-->
                                 </td>
                         </div
 			</tr>
diff --git a/data/interfaces/default/weeklypull.html b/data/interfaces/default/weeklypull.html
index b6264de6..480d3cfb 100755
--- a/data/interfaces/default/weeklypull.html
+++ b/data/interfaces/default/weeklypull.html
@@ -128,7 +128,7 @@
                                                 %endif
                                                 </a>
                                             %endif
-                                            %if weekly['HASH'] is not None:
+                                            %if weekly['HASH'] is not None and mylar.CONFIG.AUTO_SNATCH is True:
                                                 <a href="#" onclick="doAjaxCall('torrentit?torrent_hash=${weekly['HASH']}&download=True',$(this),'table')" title="Auto-Snatch torrent file">
                                                 %if mylar.CONFIG.SHOW_ICONS:
                                                      <img style="margin: 0px 5px" src="interfaces/default/images/snatch.png" height="25" width="25" class="highqual" />
@@ -169,7 +169,7 @@
                                             %else:
                                                 <% dl = False %>
                                             %endif
-                                            %if weekly['ISSUEID'] is None and weekly['STATUS'] == 'Skipped':
+                                            %if weekly['HAVEIT'] == 'No' and weekly['STATUS'] == 'Skipped':
                                                 <a href="#" onclick="doAjaxCall('queueit?ComicName=${weekly['COMIC'] | u}&ComicID=${weekly['COMICID']}&IssueID=${weekly['ISSUEID']}&ComicIssue=${weekly['ISSUE']}&mode=pullwant&Publisher=${weekly['PUBLISHER']}&pullinfo=${weekinfo['midweek']}&pullweek=${weekinfo['weeknumber']}&pullyear=${weekinfo['year']}',$(this),'table')" data-success="Successfully submitted search request for ${weekly['COMIC']} #${weekly['ISSUE']}" title="One off download">
                                                 %if mylar.CONFIG.SHOW_ICONS:
                                                     <img style="margin: 0px 5px" src="interfaces/default/images/search.png" height="25" width="25" class="highqual" />
@@ -178,6 +178,7 @@
                                                 %endif
                                                 </a>
                                             %endif
+<!--
                                             <a class="menu_link_edit" id="choose_specific_download" title="Choose Specific Download" href="javascript:void(0)" onclick="getAvailableDownloads('${weekly['ISSUEID']}', '${weekly['COMIC']}', '${weekly['COMICID']}', '${weekly['ISSUE']}', '${weekly['VOLUME']}', 'pullwant', '${weekly['PUBLISHER']}', '${weekinfo['midweek']}', '${weekinfo['weeknumber']}', '${weekinfo['year']}', '${dl}')">
                                             %if mylar.CONFIG.SHOW_ICONS:
                                                 <img style="margin: 0px 5px" src="interfaces/default/images/magnifier.png" height="25" width="25" class="highqual" />
@@ -199,7 +200,8 @@
                                                  </tbody>
                                               </table>
                                             </div>
-                                        %elif weekly['HASH'] is not None:
+-->
+                                        %elif weekly['HASH'] is not None and mylar.CONFIG.AUTO_SNATCH is True:
                                             <a href="#" onclick="doAjaxCall('torrentit?torrent_hash=${weekly['HASH']}&download=True',$(this),'table')" title="Auto-Snatch torrent file">
                                             %if mylar.CONFIG.SHOW_ICONS:
                                                 <img style="margin: 0px 5px" src="interfaces/default/images/snatch.png" height="25" width="25" class="highqual" />
@@ -207,6 +209,14 @@
                                                 <span class="ui-icon ui-icon-plus"></span>Auto-Snatch
                                             %endif
                                             </a>
+                                        %elif weekly['STATUS'] == 'Snatched':
+                                            <a href="#" onclick="doAjaxCall('queueit?ComicName=${weekly['COMIC'] | u}&ComicID=${weekly['COMICID']}&IssueID=${weekly['ISSUEID']}&ComicIssue=${weekly['ISSUE']}&mode=pullwant&Publisher=${weekly['PUBLISHER']}&pullinfo=${weekinfo['midweek']}&pullweek=${weekinfo['weeknumber']}&pullyear=${weekinfo['year']}',$(this),'table')" data-success="Successfully submitted search request for ${weekly['COMIC']} #${weekly['ISSUE']}" title="Snatch issue again">
+                                            %if mylar.CONFIG.SHOW_ICONS:
+                                                  <img style="margin: 0px 5px" src="interfaces/default/images/retry.png" height="25" width="25" class="highqual" />
+                                            %else:
+                                                  <span class="ui-icon ui-icon-plus"></span>Retry
+                                            %endif
+                                            </a>
                                         %endif
                                         </td>
                                 %endif