diff --git a/PlexRequests.Services/Jobs/CouchPotatoCacher.cs b/PlexRequests.Services/Jobs/CouchPotatoCacher.cs
index 3fb831b12..be36d004f 100644
--- a/PlexRequests.Services/Jobs/CouchPotatoCacher.cs
+++ b/PlexRequests.Services/Jobs/CouchPotatoCacher.cs
@@ -24,6 +24,8 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
+using System;
 using System.Linq;
 
 using NLog;
@@ -86,8 +88,18 @@ namespace PlexRequests.Services.Jobs
         // we do not want to set here...
         public int[] QueuedIds()
         {
-            var movies = Cache.Get<CouchPotatoMovies>(CacheKeys.CouchPotatoQueued);
-            return movies?.movies?.Select(x => x.info.tmdb_id).ToArray() ?? new int[] { };
+            try
+            {
+                var movies = Cache.Get<CouchPotatoMovies>(CacheKeys.CouchPotatoQueued);
+
+                var items = movies?.movies?.Select(x => x.info?.tmdb_id).Cast<int>().ToArray();
+                return items ?? new int[] { };
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return new int[] {};
+            }
         }
 
         public void Execute(IJobExecutionContext context)
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index 466ff7a24..77b71e58a 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -120,8 +120,8 @@ namespace PlexRequests.Services.Notification
         {
             var message = new MimeMessage
             {
-                Body = new TextPart("plain") { Text = $"Hello! The user '{model.User}' has requested the {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} '{model.Title}'! Please log in to approve this request. Request Date: {model.DateTime.ToString("f")}" },
-                Subject = $"Plex Requests: New {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} request for {model.Title}!"
+                Body = new TextPart("plain") { Text = $"Hello! The user '{model.User}' has requested the {model.RequestType.GetString()?.ToLower()} '{model.Title}'! Please log in to approve this request. Request Date: {model.DateTime.ToString("f")}" },
+                Subject = $"Plex Requests: New {model.RequestType.GetString()?.ToLower()} request for {model.Title}!"
             };
             message.From.Add(new MailboxAddress(settings.EmailSender, settings.EmailSender));
             message.To.Add(new MailboxAddress(settings.RecipientEmail, settings.RecipientEmail));
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index 8eda8d0b9..f6003bf1d 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -105,8 +105,8 @@ namespace PlexRequests.Services.Notification
 
         private async Task PushNewRequestAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
-            var message = $"The {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} '{model.Title}' has been requested by user: {model.User}";
-            var pushTitle = $"Plex Requests: The {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} {model.Title} has been requested!";
+            var message = $"The {model.RequestType.GetString()?.ToLower()} '{model.Title}' has been requested by user: {model.User}";
+            var pushTitle = $"Plex Requests: The {model.RequestType.GetString()?.ToLower()} {model.Title} has been requested!";
             await Push(settings, message, pushTitle);
         }
 
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index 9831e6562..b259a6faa 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -105,7 +105,7 @@ namespace PlexRequests.Services.Notification
 
         private async Task PushNewRequestAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
-            var message = $"Plex Requests: The {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} '{model.Title}' has been requested by user: {model.User}";
+            var message = $"Plex Requests: The {model.RequestType.GetString()?.ToLower()} '{model.Title}' has been requested by user: {model.User}";
             await Push(settings, message);
         }
 
diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 254b4f7be..b203db7d3 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -80,7 +80,7 @@ namespace PlexRequests.Store
 
     public static class RequestTypeDisplay
     {
-        public static string Get(RequestType type)
+        public static string GetString(this RequestType type)
         {
             switch (type)
             {
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index fee4537f8..b108cf6ce 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -1,157 +1,159 @@
-@using Nancy.Security
-@using Nancy.Session
-@using PlexRequests.UI.Helpers
-@using PlexRequests.UI.Models
-@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase
-@{
-    var baseUrl = Html.GetBaseUrl();
-    var url = string.Empty;
-    if (!string.IsNullOrEmpty(baseUrl.ToHtmlString()))
-    {
-        url = "/" + baseUrl.ToHtmlString();
-    }
-}
-<html>
-<div hidden="hidden" id="baseUrl">@baseUrl.ToHtmlString()</div>
-<head>
-    <title>Plex Requests</title>
-    <!-- Styles -->
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    @Html.LoadAnalytics()
-    @Html.LoadAssets()
-</head>
-<body>
-
-
-    <nav class="navbar navbar-default">
-        <div class="container-fluid">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a class="navbar-brand" href="@url/search">Plex Requests</a>
-            </div>
-
-            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                <ul class="nav navbar-nav">
-                    @Html.GetNavbarUrl(Context, "/search", "Search", "search")
-                    @Html.GetNavbarUrl(Context, "/requests", "Requests", "plus-circle")
-                    @Html.GetNavbarUrl(Context, "/issues", "Issues", "exclamation", "<span id=\"issueCount\"></span>")
-
-                </ul>
-                <ul class="nav navbar-nav navbar-right">
-
-
-                    @if (!Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
-                    {
-
-                        <li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> Admin</a></li>
-                    }
-                    else
-                    {
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> Admin <span class="caret"></span></a>
-                            <ul class="dropdown-menu" role="menu">
-                                <li><a href="@url/admin"><i class="fa fa-cog"></i> Settings</a></li>
-                                <li><a href="@url/changepassword"><i class="fa fa-key"></i> Change password</a></li>
-                                <li class="divider"></li>
-                                <li><a href="https://www.paypal.me/PlexRequestsNet" target="_blank"><i class="fa fa-heart" style="color:red"></i> Donate!</a></li>
-                                <li class="divider"></li>
-                                <li><a href="@url/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
-                            </ul>
-                        </li>
-                    }
-                    @if (Context.Request.Session[SessionKeys.UsernameKey] != null)
-                    {
-                        <li><a href="@url/userlogin/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
-                    }
-                </ul>
-            </div>
-        </div>
-        <div id="updateAvailable" hidden="hidden"></div>
-    </nav>
-
-    <div class="container">
-        @RenderBody()
-    </div>
-    <div class="scroll-top-wrapper ">
-        <span class="scroll-top-inner">
-            <i class="fa fa-2x fa-arrow-circle-up"></i>
-        </span>
-    </div>
-</body>
-</html>
-<script>
-
-    $(function () {
-
-        var urlBase = '@Html.GetBaseUrl()';
-
-        // Check for update
-        var url = createBaseUrl(urlBase, '/updatechecker');
-        $.ajax({
-            type: "GET",
-            url: url,
-            dataType: "json",
-            success: function (response) {
-                if (response.updateAvailable) {
-                    var status = createBaseUrl(urlBase, '/admin/status');
-                    $('#updateAvailable').html("<i class='fa fa-cloud-download' aria-hidden='true'></i> There is a new update available! Click <a style='color: white' href='" + status + "'>Here!</a>");
-                    $('#updateAvailable').removeAttr("hidden");
-                    $('body').addClass('update-available');
-                }
-            },
-            error: function (e) {
-                console.log(e);
-            }
-        });
-        // End Check for update
-
-
-        // Scroller
-        $(document).on('scroll', function () {
-
-            if ($(window).scrollTop() > 100) {
-                $('.scroll-top-wrapper').addClass('show');
-            } else {
-                $('.scroll-top-wrapper').removeClass('show');
-            }
-        });
-
-        $('.scroll-top-wrapper').on('click', scrollToTop);
-        // End Scroller
-
-
-        // Get Issue count
-        var issueUrl = createBaseUrl(urlBase, '/issues/issuecount');
-        $.ajax({
-            type: "GET",
-            url: issueUrl,
-            dataType: "json",
-            success: function (response) {
-                if (response) {
-                    if(response > 0)
-                        $('#issueCount').addClass("badge");
-                        $('#issueCount').html(+response);
-                }
-            },
-            error: function (e) {
-                console.log(e);
-            }
-        });
-        // End issue count
-
-
-    });
-
-    function scrollToTop() {
-        verticalOffset = typeof (verticalOffset) != 'undefined' ? verticalOffset : 0;
-        element = $('body');
-        offset = element.offset();
-        offsetTop = offset.top;
-        $('html, body').animate({ scrollTop: offsetTop }, 500, 'linear');
-    }
+@using Nancy.Security
+@using Nancy.Session
+@using PlexRequests.UI.Helpers
+@using PlexRequests.UI.Models
+@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase
+@{
+    var baseUrl = Html.GetBaseUrl();
+    var url = string.Empty;
+    if (!string.IsNullOrEmpty(baseUrl.ToHtmlString()))
+    {
+        url = "/" + baseUrl.ToHtmlString();
+    }
+}
+<html>
+<div hidden="hidden" id="baseUrl">@baseUrl.ToHtmlString()</div>
+<head>
+    <title>Plex Requests</title>
+    <!-- Styles -->
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    @Html.LoadAnalytics()
+    @Html.LoadAssets()
+</head>
+<body>
+
+
+    <nav class="navbar navbar-default">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="@url/search">Plex Requests</a>
+            </div>
+
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav">
+                    @Html.GetNavbarUrl(Context, "/search", "Search", "search")
+                    @Html.GetNavbarUrl(Context, "/requests", "Requests", "plus-circle")
+                    @Html.GetNavbarUrl(Context, "/issues", "Issues", "exclamation", "<span id=\"issueCount\"></span>")
+                    @if (Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
+                    {
+                        <li><a href="https://www.paypal.me/PlexRequestsNet" target="_blank"><i class="fa fa-heart" style="color: red"></i> Donate</a></li>
+                    }
+                </ul>
+                <ul class="nav navbar-nav navbar-right">
+
+
+                    @if (!Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
+                    {
+
+                        <li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> Admin</a></li>
+                    }
+                    else
+                    {
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> Admin <span class="caret"></span></a>
+                            <ul class="dropdown-menu" role="menu">
+                                <li><a href="@url/admin"><i class="fa fa-cog"></i> Settings</a></li>
+                                <li><a href="@url/changepassword"><i class="fa fa-key"></i> Change password</a></li>
+
+                                <li class="divider"></li>
+                                <li><a href="@url/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
+                            </ul>
+                        </li>
+                    }
+                    @if (Context.Request.Session[SessionKeys.UsernameKey] != null)
+                    {
+                        <li><a href="@url/userlogin/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
+                    }
+                </ul>
+            </div>
+        </div>
+        <div id="updateAvailable" hidden="hidden"></div>
+    </nav>
+
+    <div class="container">
+        @RenderBody()
+    </div>
+    <div class="scroll-top-wrapper ">
+        <span class="scroll-top-inner">
+            <i class="fa fa-2x fa-arrow-circle-up"></i>
+        </span>
+    </div>
+</body>
+</html>
+<script>
+
+    $(function () {
+
+        var urlBase = '@Html.GetBaseUrl()';
+
+        // Check for update
+        var url = createBaseUrl(urlBase, '/updatechecker');
+        $.ajax({
+            type: "GET",
+            url: url,
+            dataType: "json",
+            success: function (response) {
+                if (response.updateAvailable) {
+                    var status = createBaseUrl(urlBase, '/admin/status');
+                    $('#updateAvailable').html("<i class='fa fa-cloud-download' aria-hidden='true'></i> There is a new update available! Click <a style='color: white' href='" + status + "'>Here!</a>");
+                    $('#updateAvailable').removeAttr("hidden");
+                    $('body').addClass('update-available');
+                }
+            },
+            error: function (e) {
+                console.log(e);
+            }
+        });
+        // End Check for update
+
+
+        // Scroller
+        $(document).on('scroll', function () {
+
+            if ($(window).scrollTop() > 100) {
+                $('.scroll-top-wrapper').addClass('show');
+            } else {
+                $('.scroll-top-wrapper').removeClass('show');
+            }
+        });
+
+        $('.scroll-top-wrapper').on('click', scrollToTop);
+        // End Scroller
+
+
+        // Get Issue count
+        var issueUrl = createBaseUrl(urlBase, '/issues/issuecount');
+        $.ajax({
+            type: "GET",
+            url: issueUrl,
+            dataType: "json",
+            success: function (response) {
+                if (response) {
+                    if (response > 0)
+                        $('#issueCount').addClass("badge");
+                    $('#issueCount').html(+response);
+                }
+            },
+            error: function (e) {
+                console.log(e);
+            }
+        });
+        // End issue count
+
+
+    });
+
+    function scrollToTop() {
+        verticalOffset = typeof (verticalOffset) != 'undefined' ? verticalOffset : 0;
+        element = $('body');
+        offset = element.offset();
+        offsetTop = offset.top;
+        $('html, body').animate({ scrollTop: offsetTop }, 500, 'linear');
+    }
 </script>
\ No newline at end of file