diff --git a/Ombi.Api/CouchPotatoApi.cs b/Ombi.Api/CouchPotatoApi.cs
index a6434c30f..8c28faa34 100644
--- a/Ombi.Api/CouchPotatoApi.cs
+++ b/Ombi.Api/CouchPotatoApi.cs
@@ -100,9 +100,9 @@ namespace Ombi.Api
 
             var obj = RetryHandler.Execute<CouchPotatoStatus>(() => Api.Execute<CouchPotatoStatus>(request, url),
                 (exception, timespan) => Log.Error(exception, "Exception when calling GetStatus for CP, Retrying {0}", timespan), new TimeSpan[] {
-                    TimeSpan.FromSeconds (2),
-                    TimeSpan.FromSeconds(5),
-                    TimeSpan.FromSeconds(10)});
+                    TimeSpan.FromSeconds (1),
+                    TimeSpan.FromSeconds(2),
+                    TimeSpan.FromSeconds(3)});
 
             return obj;
         }
@@ -140,9 +140,9 @@ namespace Ombi.Api
             {
                 var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoMovies>(request, baseUrl),
                     (exception, timespan) => Log.Error(exception, "Exception when calling GetMovies for CP, Retrying {0}", timespan), new[] {
-                        TimeSpan.FromSeconds (5),
-                        TimeSpan.FromSeconds(10),
-                        TimeSpan.FromSeconds(30)
+                        TimeSpan.FromSeconds (1),
+                        TimeSpan.FromSeconds(5),
+                        TimeSpan.FromSeconds(5)
                     });
 
                 return obj;
diff --git a/Ombi.Core.Migration/Migrations/Version2200.cs b/Ombi.Core.Migration/Migrations/Version2200.cs
index ac9b5d1a7..f2b3b6fd2 100644
--- a/Ombi.Core.Migration/Migrations/Version2200.cs
+++ b/Ombi.Core.Migration/Migrations/Version2200.cs
@@ -52,8 +52,8 @@ namespace Ombi.Core.Migration.Migrations
         public void Start(IDbConnection con)
         {
             UpdatePlexSettings();
-            //UpdateCustomSettings(); Turned off the migration for now until the search has been improved on.
-            //UpdateSchema(con, Version);
+            UpdateCustomSettings();
+            UpdateSchema(con, Version);
         }
 
         private void UpdatePlexSettings()
@@ -68,7 +68,7 @@ namespace Ombi.Core.Migration.Migrations
         {
 
             var settings = Customization.GetSettings();
-            settings.NewSearch = true; // Use the new search
+            settings.EnableIssues = true; 
 
             Customization.SaveSettings(settings);
 
diff --git a/Ombi.Core/Notification/Templates/BasicRequestTemplate.html b/Ombi.Core/Notification/Templates/BasicRequestTemplate.html
index 3e1109517..3e4d5cf56 100644
--- a/Ombi.Core/Notification/Templates/BasicRequestTemplate.html
+++ b/Ombi.Core/Notification/Templates/BasicRequestTemplate.html
@@ -144,7 +144,7 @@
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
                                     <tr>
                                         <td align="center">
-                                            <img src="http://i.imgur.com/ROTp8mn.png" text-align="center" />
+                                            <img src="http://i.imgur.com/qQsN78U.png" width="400px"  text-align="center" />
                                         </td>
                                     </tr>
                                     <tr>
diff --git a/Ombi.Core/SettingModels/CustomizationSettings.cs b/Ombi.Core/SettingModels/CustomizationSettings.cs
index d7aff1e51..98468c9be 100644
--- a/Ombi.Core/SettingModels/CustomizationSettings.cs
+++ b/Ombi.Core/SettingModels/CustomizationSettings.cs
@@ -54,6 +54,7 @@ namespace Ombi.Core.SettingModels
         public int DefaultLang { get; set; }
 
         public bool NewSearch { get; set; }
+        public bool EnableIssues { get; set; }
 
     }
 }
\ No newline at end of file
diff --git a/Ombi.Services/Jobs/Templates/MassEmailTemplate.html b/Ombi.Services/Jobs/Templates/MassEmailTemplate.html
index 02214c6af..18a724b93 100644
--- a/Ombi.Services/Jobs/Templates/MassEmailTemplate.html
+++ b/Ombi.Services/Jobs/Templates/MassEmailTemplate.html
@@ -144,7 +144,7 @@
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
                                     <tr>
                                         <td align="center">
-                                            <img src="http://i.imgur.com/ROTp8mn.png" text-align="center" />
+                                            <img src="http://i.imgur.com/qQsN78U.png" width="400px" text-align="center" />
                                         </td>
                                     </tr>
                                     <tr>
diff --git a/Ombi.Services/Jobs/Templates/RecentlyAddedTemplate.html b/Ombi.Services/Jobs/Templates/RecentlyAddedTemplate.html
index f5b208138..932aae99f 100644
--- a/Ombi.Services/Jobs/Templates/RecentlyAddedTemplate.html
+++ b/Ombi.Services/Jobs/Templates/RecentlyAddedTemplate.html
@@ -144,7 +144,7 @@
                                 <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
                                     <tr>
                                         <td align="center">
-                                            <img src="http://i.imgur.com/ROTp8mn.png" text-align="center" />
+                                            <img src="http://i.imgur.com/qQsN78U.png"  width="400px" text-align="center" />
                                         </td>
                                     </tr>
                                     <tr>
diff --git a/Ombi.UI/Helpers/BaseUrlHelper.cs b/Ombi.UI/Helpers/BaseUrlHelper.cs
index 99c37459e..cb0600ce7 100644
--- a/Ombi.UI/Helpers/BaseUrlHelper.cs
+++ b/Ombi.UI/Helpers/BaseUrlHelper.cs
@@ -314,6 +314,7 @@ namespace Ombi.UI.Helpers
             {
                 url = $"/{content}{url}";
             }
+
             var returnString = context.Request.Path == url ?
                                       $"<li class=\"active\"><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title}</a></li>"
                                       : $"<li><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title}</a></li>";
@@ -328,7 +329,14 @@ namespace Ombi.UI.Helpers
             {
                 url = $"/{content}{url}";
             }
-
+            if (url.Contains("issues"))
+            {
+                var custom = GetCustomizationSettings();
+                if (!custom.EnableIssues)
+                {
+                    return helper.Raw(string.Empty);
+                }
+            }
             var returnString = context.Request.Path == url
                 ? $"<li class=\"active\"><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title} {extraHtml}</a></li>"
                 : $"<li><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title} {extraHtml}</a></li>";
diff --git a/Ombi.UI/Views/Customization/Customization.cshtml b/Ombi.UI/Views/Customization/Customization.cshtml
index 583dbabae..a220f950d 100644
--- a/Ombi.UI/Views/Customization/Customization.cshtml
+++ b/Ombi.UI/Views/Customization/Customization.cshtml
@@ -104,7 +104,8 @@
                 </div>
             </div>
 
-            @Html.Checkbox(Model.Settings.NewSearch, "NewSearch", "Use New Search")
+            @*@Html.Checkbox(Model.Settings.NewSearch, "NewSearch", "Use New Search")*@
+            @Html.Checkbox(Model.Settings.EnableIssues, "EnableIssues", "Enable Issues")
             <div class="form-group">
                 <div>
                     <button type="submit" id="save" class="btn btn-primary-outline">Submit</button>