diff --git a/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html b/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html
index e9a2b7f29..81190334a 100644
--- a/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html
+++ b/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html
@@ -157,12 +157,12 @@
 
                     <!-- START CENTERED WHITE CONTAINER -->
                     <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Ombi Recently Added</span>
-                    <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; border-radius: 3px;" width="100%">
+                    <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-radius: 3px;">
 
                         <!-- START MAIN CONTENT AREA -->
                         <tr>
                             <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;" valign="top">
-                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
+                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; max-width: 1042px; width: 100%;">
                                     <tr>
                                         <td align="center">
                                             <img src="{@LOGO}" width="400px" text-align="center"/>
diff --git a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
index ed34a6236..651c7287f 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
@@ -306,7 +306,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             var embyMovies = embyContentToSend.Where(x => x.Type == EmbyMediaType.Movie);
             if ((plexMovies.Any() || embyMovies.Any()) && !settings.DisableMovies)
             {
-                sb.Append("<h1 style=\"text-align: center;\">New Movies</h1><br /><br />");
+                sb.Append("<h1 style=\"text-align: center; max-width: 1042px;\">New Movies</h1><br /><br />");
                 sb.Append(
                 "<table class=\"movies-table\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100 %; \">");
                 sb.Append("<tr>");
@@ -324,7 +324,7 @@ namespace Ombi.Schedule.Jobs.Ombi
 
             if ((plexEpisodes.Any() || embyEp.Any()) && !settings.DisableTv)
             {
-                sb.Append("<br /><br /><h1 style=\"text-align: center;\">New TV</h1><br /><br />");
+                sb.Append("<br /><br /><h1 style=\"text-align: center; max-width: 1042px;\">New TV</h1><br /><br />");
                 sb.Append(
                 "<table class=\"tv-table\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100 %; \">");
                 sb.Append("<tr>");
@@ -588,7 +588,6 @@ namespace Ombi.Schedule.Jobs.Ombi
                     {
                         AddGenres(sb, $"Genres: {string.Join(", ", info.genres.Select(x => x.ToString()).ToArray())}");
                     }
-                    count += 1;
 
                 }
                 catch (Exception e)
@@ -598,6 +597,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 finally
                 {
                     EndLoopHtml(sb);
+                    count += 1;
                 }
 
                 if (count == 2)
@@ -752,7 +752,6 @@ namespace Ombi.Schedule.Jobs.Ombi
                     {
                         AddGenres(sb, $"Genres: {string.Join(", ", info.genres.Select(x => x.ToString()).ToArray())}");
                     }
-                    count += 1;
 
                 }
                 catch (Exception e)
@@ -762,6 +761,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 finally
                 {
                     EndLoopHtml(sb);
+                    count += 1;
                 }
 
                 if (count == 2)