diff --git a/NzbDrone.Web/Content/style.css b/NzbDrone.Web/Content/style.css
index 1e0e80e92..7f44c4fa0 100644
--- a/NzbDrone.Web/Content/style.css
+++ b/NzbDrone.Web/Content/style.css
@@ -268,3 +268,9 @@ button, input[type="button"], input[type="submit"], input[type="reset"]
 {
     width: 400px;
 }
+
+/* Set the font size for Grids */
+.Grid
+{
+    font-size: 13px;
+}
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Log/Index.aspx b/NzbDrone.Web/Views/Log/Index.cshtml
similarity index 68%
rename from NzbDrone.Web/Views/Log/Index.aspx
rename to NzbDrone.Web/Views/Log/Index.cshtml
index 748108407..927c11cd3 100644
--- a/NzbDrone.Web/Views/Log/Index.aspx
+++ b/NzbDrone.Web/Views/Log/Index.cshtml
@@ -1,5 +1,6 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<IEnumerable<NzbDrone.Core.Instrumentation.Log>>" %>
-<asp:Content ContentPlaceHolderID="Scripts" runat="server">
+@model IEnumerable<NzbDrone.Core.Instrumentation.Log>
+           
+@section Scripts{
     <script type="text/javascript">
         function onRowDataBound(e) {
 
@@ -18,19 +19,20 @@
             //e.row.style.color = 'blue';
         }
     </script>
-</asp:Content>
-<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
+}
+
+@section TitleContent{
     Logs
-</asp:Content>
-<asp:Content ID="Menu" ContentPlaceHolderID="ActionMenu" runat="server">
-    <%
-        Html.Telerik().Menu().Name("logMenu").Items(items => items.Add().Text("Clear Logs").Action("Clear", "Log")).
-            Render();
-%>
-</asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <%
-        Html.Telerik().Grid(Model).Name("logs")
+}
+
+@section ActionMenu{
+    @{Html.Telerik().Menu().Name("logMenu").Items(items => items.Add().Text("Clear Logs").Action("Clear", "Log"))
+        .Render();}
+}
+
+@section MainContent{
+    @{Html.Telerik().Grid(Model).Name("logsGrid")
+            .TableHtmlAttributes(new { @class = "Grid" })
             .Columns(columns =>
                          {
                              columns.Bound(c => c.Time).Title("Time").Width(190);
@@ -49,6 +51,6 @@
                 c.PageSize(50).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
             .Filterable()
             .ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
-            .Render();
-%>
-</asp:Content>
+            .Render();}
+}
+
diff --git a/NzbDrone.Web/Views/Shared/SiteLayout.cshtml b/NzbDrone.Web/Views/Shared/SiteLayout.cshtml
index 9f877b17a..a3a846299 100644
--- a/NzbDrone.Web/Views/Shared/SiteLayout.cshtml
+++ b/NzbDrone.Web/Views/Shared/SiteLayout.cshtml
@@ -14,9 +14,6 @@
         <link href="../../Content/style.css" rel="stylesheet" type="text/css" />
         <link href="../../Content/jquery-ui.css" rel="stylesheet" type="text/css" />
         <link href="../../Content/jquery-ui.custom.css" rel="stylesheet" type="text/css" />
-        @*<link href="../../Content/jquery-simpledropdown.css" rel="stylesheet" type="text/css" />*@
-        @*<script type="text/javascript" src="../../Scripts/jquery-1.5.2.min.js"></script>*@
-        @*<script type="text/javascript" src="../../Scripts/jquery-ui-1.8.8.min.js"></script>*@
 
         @RenderSection("HeaderContent", required: false)
     </head>
diff --git a/NzbDrone.Web/Views/Upcoming/Index.aspx b/NzbDrone.Web/Views/Upcoming/Index.cshtml
similarity index 83%
rename from NzbDrone.Web/Views/Upcoming/Index.aspx
rename to NzbDrone.Web/Views/Upcoming/Index.cshtml
index 1e87c184b..0f32918b4 100644
--- a/NzbDrone.Web/Views/Upcoming/Index.aspx
+++ b/NzbDrone.Web/Views/Upcoming/Index.cshtml
@@ -1,10 +1,10 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<List<NzbDrone.Web.Models.UpcomingEpisodeModel>>" %>
-<%@ Import Namespace="NzbDrone.Web.Models" %>
+@model List<NzbDrone.Web.Models.UpcomingEpisodeModel>
+@using NzbDrone.Web.Models
+
+@section Scripts{
 
-<asp:Content ID="Content1" ContentPlaceHolderID="Scripts" runat="server">
     <script type="text/javascript">
         function onRowDataBound(e) {
-
             e.row.style.boarder = "";
 
             if (e.dataItem.Level == 3) {
@@ -20,23 +20,23 @@
             //e.row.style.color = 'blue';
         }
     </script>
-</asp:Content>
-<asp:Content ID="Content2" ContentPlaceHolderID="TitleContent" runat="server">
+}
+
+@section TitleContent{
     Upcoming
-</asp:Content>
-<asp:Content ID="Menu" ContentPlaceHolderID="ActionMenu" runat="server">
-    <%
-        Html.Telerik().Menu().Name("historyMenu").Items(
-            items => { items.Add().Text("Start RSS Sync").Action("RssSync", "Series"); }).Render();
-%>
-</asp:Content>
-<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
+}
+
+@section ActionMenu{
+    @{Html.Telerik().Menu().Name("historyMenu").Items(
+            items => { items.Add().Text("Start RSS Sync").Action("RssSync", "Series"); }).Render();}
+}
 
+@section MainContent{
     <div id="yesterday">
         <h2>Yesterday</h2>
-        <%
-            Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Yesterday").NoRecordsTemplate(
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Yesterday").NoRecordsTemplate(
                 "No watched shows aired yesterday")
+                .TableHtmlAttributes(new { @class = "Grid" })
                 .Columns(columns =>
                              {
                                  columns.Bound(c => c.SeriesName)
@@ -59,16 +59,15 @@
                 //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric))
                 //.Filterable()
                 //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
-                .Render();
-%>
+                .Render();}
     </div>
 
     <br />
 
     <div id="today">
         <h2>Today</h2>
-        <%
-            Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Today").NoRecordsTemplate("No watched shows airing today.")
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Today").NoRecordsTemplate("No watched shows airing today.")
+                .TableHtmlAttributes(new { @class = "Grid" })
                 .Columns(columns =>
                              {
                                  columns.Bound(c => c.SeriesName)
@@ -91,17 +90,16 @@
                 //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric))
                 //.Filterable()
                 //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
-                .Render();
-%>
+                .Render();}
     </div>
 
     <br />
     
     <div id="week">
     <h2>7-Day Forecast</h2>
-        <%
-            Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Week").NoRecordsTemplate(
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Week").NoRecordsTemplate(
                 "No watched shows airing in the next week...")
+                .TableHtmlAttributes(new { @class = "Grid" })
                 .Columns(columns =>
                              {
                                  columns.Bound(c => c.SeriesName)
@@ -124,7 +122,6 @@
                 //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric))
                 //.Filterable()
                 //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
-                .Render();
-%>
+                .Render();}
     </div>
-</asp:Content>
+}
\ No newline at end of file