diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs
index 0dde472543..d1f50f01b0 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.Designer.cs
@@ -1,606 +1,541 @@
-namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
-{
-#line 1 "DetailsPage.cshtml"
-using System
-
-#line default
-#line hidden
-    ;
-#line 2 "DetailsPage.cshtml"
-using System.Globalization
-
-#line default
-#line hidden
-    ;
-#line 3 "DetailsPage.cshtml"
-using System.Linq
-
-#line default
-#line hidden
-    ;
-#line 4 "DetailsPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.Elm
-
-#line default
-#line hidden
-    ;
-#line 5 "DetailsPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
-
-#line default
-#line hidden
-    ;
-#line 6 "DetailsPage.cshtml"
-using Microsoft.Extensions.RazorViews
-
-#line default
-#line hidden
-    ;
-#line 7 "DetailsPage.cshtml"
-using Microsoft.Extensions.Logging
-
-#line default
-#line hidden
-    ;
-    using System.Threading.Tasks;
-
-    internal class DetailsPage : Microsoft.Extensions.RazorViews.BaseView
-    {
-#line 10 "DetailsPage.cshtml"
-
-    public DetailsPage(DetailsPageModel model)
-    {
-        Model = model;
-    }
-
-    public DetailsPageModel Model { get; set; }
-
-    public HelperResult LogRow(LogInfo log)
-    {
-        return new HelperResult((writer) =>
-        {
-            if (log.Severity >= Model.Options.MinLevel &&
-               (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
-            {
-                WriteLiteralTo(writer, "        <tr>\r\n            <td>");
-                WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time));
-                WriteLiteralTo(writer, "</td>\r\n            <td>");
-                WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time));
-                var severity = log.Severity.ToString().ToLowerInvariant();
-                WriteLiteralTo(writer, $"</td>\r\n            <td class=\"{severity}\">");
-                WriteTo(writer, log.Severity);
-
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Name}\">");
-                WriteTo(writer, log.Name);
-
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Message}\""+
-                    "class=\"logState\" width=\"100px\">");
-                WriteTo(writer, log.Message);
-
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Exception}\">");
-                WriteTo(writer, log.Exception);
-
-                WriteLiteralTo(writer, "</td>\r\n        </tr>\r\n");
-            }
-        });
-    }
-
-    public HelperResult Traverse(ScopeNode node)
-    {
-        return new HelperResult((writer) =>
-        {
-            var messageIndex = 0;
-            var childIndex = 0;
-            while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
-            {
-                if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
-                {
-                    LogRow(node.Messages[messageIndex]);
-                    messageIndex++;
-                }
-                else
-                {
-                    Traverse(node.Children[childIndex]);
-                    childIndex++;
-                }
-            }
-            if (messageIndex < node.Messages.Count)
-            {
-                for (var i = messageIndex; i < node.Messages.Count; i++)
-                {
-                    LogRow(node.Messages[i]);
-                }
-            }
-            else
-            {
-                for (var i = childIndex; i < node.Children.Count; i++)
-                {
-                    Traverse(node.Children[i]);
-                }
-            }
-        });
-    }
-
-#line default
-#line hidden
-        #line hidden
-        public DetailsPage()
-        {
-        }
-
-        #pragma warning disable 1998
-        public override async Task ExecuteAsync()
-        {
-            WriteLiteral("\r\n");
-#line 84 "DetailsPage.cshtml"
-  
-    Response.ContentType = "text/html; charset=utf-8";
-
-#line default
-#line hidden
-
-            WriteLiteral(@"<!DOCTYPE html>
-<html>
-<head>
-    <meta charset=""utf-8"" />
-    <title>ASP.NET Core Logs</title>
-    <script src=""http://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js""></script>
-    <style>
-        body {
-    font-family: 'Segoe UI', Tahoma, Arial, Helvtica, sans-serif;
-    line-height: 1.4em;
-}
-
-h1 {
-    font-family: 'Segoe UI', Helvetica, sans-serif;
-    font-size: 2.5em;
-}
-
-td {
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-tr:nth-child(2n) {
-    background-color: #F6F6F6;
-}
-
-.critical {
-    background-color: red;
-    color: white;
-}
-
-.error {
-    color: red;
-}
-
-.information {
-    color: blue;
-}
-
-.debug {
-    color: black;
-}
-
-.warning {
-    color: orange;
-} body {
-    font-size: 0.9em;
-    width: 90%;
-    margin: 0px auto;
-}
-
-h1 {
-    padding-bottom: 10px;
-}
-
-h2 {
-    font-weight: normal;
-}
-
-table {
-    border-spacing: 0px;
-    width: 100%;
-    border-collapse: collapse;
-    border: 1px solid black;
-    white-space: pre-wrap;
-}
-
");
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
+{
+    #line hidden
+#line 1 "DetailsPage.cshtml"
+using System;
+
+#line default
+#line hidden
+    using System.Threading.Tasks;
+#line 2 "DetailsPage.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#line 3 "DetailsPage.cshtml"
+using System.Linq;
+
+#line default
+#line hidden
+#line 4 "DetailsPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.Elm;
+
+#line default
+#line hidden
+#line 5 "DetailsPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews;
+
+#line default
+#line hidden
+#line 6 "DetailsPage.cshtml"
+using Microsoft.Extensions.RazorViews;
+
+#line default
+#line hidden
+#line 7 "DetailsPage.cshtml"
+using Microsoft.Extensions.Logging;
+
+#line default
+#line hidden
+    internal class DetailsPage : Microsoft.Extensions.RazorViews.BaseView
+    {
+        #pragma warning disable 1998
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
+        {
+            WriteLiteral("\r\n");
+#line 86 "DetailsPage.cshtml"
+  
+    Response.ContentType = "text/html; charset=utf-8";
+
+#line default
+#line hidden
+            WriteLiteral(@"<!DOCTYPE html>
+<html>
+<head>
+    <meta charset=""utf-8"" />
+    <title>ASP.NET Core Logs</title>
+    <script src=""http://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js""></script>
+    <style>
+        body {
+    font-family: 'Segoe UI', Tahoma, Arial, Helvtica, sans-serif;
+    line-height: 1.4em;
+}
+
+h1 {
+    font-family: 'Segoe UI', Helvetica, sans-serif;
+    font-size: 2.5em;
+}
+
+td {
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+tr:nth-child(2n) {
+    background-color: #F6F6F6;
+}
+
+.critical {
+    background-color: red;
+    color: white;
+}
+
+.error {
+    color: red;
+}
+
+.information {
+    color: blue;
+}
+
+.debug {
+    color: black;
+}
+
+.warning {
+    color: orange;
+} body {
+    font-size: 0.9em;
+    width: 90%;
+    margin: 0px auto;
+}
+
+h1 {
+    padding-bottom: 10px;
+}
+
+h2 {
+    font-weight: normal;
+}
+
+table {
+    border-spacing: 0px;
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid black;
+    white-space: pre-wrap;
+}
+
+");
             WriteLiteral(@"
-th {
-    font-family: Arial;
-}
-
-td, th {
-    padding: 8px;
-}
-
-#headerTable, #cookieTable {
-    border: none;
-    height: 100%;
-}
-
-#headerTd {
-    white-space: normal;
-}
-
-#label {
-    width: 20%;
-    border-right: 1px solid black;
-}
-
-#logs{
-    margin-top: 10px;
-    margin-bottom: 20px;
-}
-
-#logs>tbody>tr>td {
-    border-right: 1px dashed lightgray;
-}
-
-#logs>thead>tr>th {
-    border: 1px solid black;
-}
-    </style>
-</head>
-<body>
-    <h1>ASP.NET Core Logs</h1>
-");
-#line 192 "DetailsPage.cshtml"
-    
-
-#line default
-#line hidden
-
-#line 192 "DetailsPage.cshtml"
-      
-        var context = Model.Activity?.HttpInfo;
-    
-
-#line default
-#line hidden
-
-            WriteLiteral("    ");
-#line 195 "DetailsPage.cshtml"
-     if (context != null)
-    {
-
-#line default
-#line hidden
-
-            WriteLiteral("        <h2 id=\"requestHeader\">Request Details</h2>\r\n        <table id=\"requestDetails\">\r\n            <colgroup><col id=\"label\" /><col /></colgroup>\r\n\r\n            <tr>\r\n                <th>Path</th>\r\n                <td>");
-#line 203 "DetailsPage.cshtml"
-               Write(context.Path);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Host</th>\r\n                <td>");
-#line 207 "DetailsPage.cshtml"
-               Write(context.Host);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Content Type</th>\r\n                <td>");
-#line 211 "DetailsPage.cshtml"
-               Write(context.ContentType);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Method</th>\r\n                <td>");
-#line 215 "DetailsPage.cshtml"
-               Write(context.Method);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Protocol</th>\r\n                <td>");
-#line 219 "DetailsPage.cshtml"
-               Write(context.Protocol);
-
-#line default
-#line hidden
-            WriteLiteral(@"</td>
-            </tr>
-            <tr>
-                <th>Headers</th>
-                <td id=""headerTd"">
-                    <table id=""headerTable"">
-                        <thead>
-                            <tr>
-                                <th>Variable</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-");
-#line 232 "DetailsPage.cshtml"
-                            
-
-#line default
-#line hidden
-
-#line 232 "DetailsPage.cshtml"
-                             foreach (var header in context.Headers)
-                            {
-
-#line default
-#line hidden
-
-            WriteLiteral("                            <tr>\r\n                                <td>");
-#line 235 "DetailsPage.cshtml"
-                               Write(header.Key);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                                <td>");
-#line 236 "DetailsPage.cshtml"
-                               Write(string.Join(";", header.Value));
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                            </tr>\r\n");
-#line 238 "DetailsPage.cshtml"
-                            }
-
-#line default
-#line hidden
-
-            WriteLiteral("                        </tbody>\r\n                    </table>\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th>Status Code</th>\r\n                <td>");
-#line 245 "DetailsPage.cshtml"
-               Write(context.StatusCode);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>User</th>\r\n                <td>");
-#line 249 "DetailsPage.cshtml"
-               Write(context.User.Identity.Name);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Claims</th>\r\n                <td>\r\n");
-#line 254 "DetailsPage.cshtml"
-                    
-
-#line default
-#line hidden
-
-#line 254 "DetailsPage.cshtml"
-                     if (context.User.Claims.Any())
-                    {
-
-#line default
-#line hidden
-
-            WriteLiteral(@"                    <table id=""claimsTable"">
-                        <thead>
-                            <tr>
-                                <th>Issuer</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-");
-#line 264 "DetailsPage.cshtml"
-                            
-
-#line default
-#line hidden
-
-#line 264 "DetailsPage.cshtml"
-                             foreach (var claim in context.User.Claims)
-                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 267 "DetailsPage.cshtml"
-                                   Write(claim.Issuer);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                                    <td>");
-#line 268 "DetailsPage.cshtml"
-                                   Write(claim.Value);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 270 "DetailsPage.cshtml"
-                                }
-
-#line default
-#line hidden
-
-            WriteLiteral("                        </tbody>\r\n                    </table>\r\n");
-#line 273 "DetailsPage.cshtml"
-                    }
-
-#line default
-#line hidden
-
-            WriteLiteral("                </td>\r\n            </tr>\r\n            <tr>\r\n                <th>Scheme</th>\r\n                <td>");
-#line 278 "DetailsPage.cshtml"
-               Write(context.Scheme);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Query</th>\r\n                <td>");
-#line 282 "DetailsPage.cshtml"
-               Write(context.Query.Value);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Cookies</th>\r\n                <td>\r\n");
-#line 287 "DetailsPage.cshtml"
-                    
-
-#line default
-#line hidden
-
-#line 287 "DetailsPage.cshtml"
-                     if (context.Cookies.Any())
-                    {
-
-#line default
-#line hidden
-
-            WriteLiteral(@"                    <table id=""cookieTable"">
-                        <thead>
-                            <tr>
-                                <th>Variable</th>
-                                <th>Value</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-");
-#line 297 "DetailsPage.cshtml"
-                            
-
-#line default
-#line hidden
-
-#line 297 "DetailsPage.cshtml"
-                             foreach (var cookie in context.Cookies)
-                                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 300 "DetailsPage.cshtml"
-                                   Write(cookie.Key);
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                                    <td>");
-#line 301 "DetailsPage.cshtml"
-                                   Write(string.Join(";", cookie.Value));
-
-#line default
-#line hidden
-            WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 303 "DetailsPage.cshtml"
-                                }
-
-#line default
-#line hidden
-
-            WriteLiteral("                        </tbody>\r\n                    </table>\r\n");
-#line 306 "DetailsPage.cshtml"
-                    }
-
-#line default
-#line hidden
-
-            WriteLiteral("                </td>\r\n            </tr>\r\n        </table>\r\n");
-#line 310 "DetailsPage.cshtml"
-    }
-
-#line default
-#line hidden
-
-            WriteLiteral("    <h2>Logs</h2>\r\n    <form method=\"get\">\r\n        <select name=\"level\">\r\n");
-#line 314 "DetailsPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 314 "DetailsPage.cshtml"
-             foreach (var severity in Enum.GetValues(typeof(LogLevel)))
-            {
-                var severityInt = (int)severity;
-                if ((int)Model.Options.MinLevel == severityInt)
-                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 8920, "\"", 8940, 1);
-#line 319 "DetailsPage.cshtml"
-WriteAttributeValue("", 8928, severityInt, 8928, 12, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(" selected=\"selected\">");
-#line 319 "DetailsPage.cshtml"
-                                                                Write(severity);
-
-#line default
-#line hidden
-            WriteLiteral("</option>\r\n");
-#line 320 "DetailsPage.cshtml"
-                }
-                else
-                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 9069, "\"", 9089, 1);
-#line 323 "DetailsPage.cshtml"
-WriteAttributeValue("", 9077, severityInt, 9077, 12, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(">");
-#line 323 "DetailsPage.cshtml"
-                                            Write(severity);
-
-#line default
-#line hidden
-            WriteLiteral("</option>\r\n");
-#line 324 "DetailsPage.cshtml"
-                }
-            }
-
-#line default
-#line hidden
-
-            WriteLiteral("        </select>\r\n        <input type=\"text\" name=\"name\"");
-            BeginWriteAttribute("value", " value=\"", 9202, "\"", 9235, 1);
-#line 327 "DetailsPage.cshtml"
-WriteAttributeValue("", 9210, Model.Options.NamePrefix, 9210, 25, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(@" />
-        <input type=""submit"" value=""filter"" />
-    </form>
-    <table id=""logs"">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Time</th>
-                <th>Severity</th>
-                <th>Name</th>
-                <th>State</th>
-                <th>Error</th>
-            </tr>
-        </thead>
-        ");
-#line 341 "DetailsPage.cshtml"
-   Write(Traverse(Model.Activity.Root));
-
-#line default
-#line hidden
-            WriteLiteral(@"
-    </table>
-    <script type=""text/javascript"">
-        $(document).ready(function () {
-            $(""#requestHeader"").click(function () {
-                $(""#requestDetails"").toggle();
-            });
-        });
-    </script>
-</body>
-</html>");
-        }
-        #pragma warning restore 1998
-    }
-}
+th {
+    font-family: Arial;
+}
+
+td, th {
+    padding: 8px;
+}
+
+#headerTable, #cookieTable {
+    border: none;
+    height: 100%;
+}
+
+#headerTd {
+    white-space: normal;
+}
+
+#label {
+    width: 20%;
+    border-right: 1px solid black;
+}
+
+#logs{
+    margin-top: 10px;
+    margin-bottom: 20px;
+}
+
+#logs>tbody>tr>td {
+    border-right: 1px dashed lightgray;
+}
+
+#logs>thead>tr>th {
+    border: 1px solid black;
+}
+    </style>
+</head>
+<body>
+    <h1>ASP.NET Core Logs</h1>
+");
+#line 194 "DetailsPage.cshtml"
+      
+        var context = Model.Activity?.HttpInfo;
+    
+
+#line default
+#line hidden
+            WriteLiteral("    ");
+#line 197 "DetailsPage.cshtml"
+     if (context != null)
+    {
+
+#line default
+#line hidden
+            WriteLiteral("        <h2 id=\"requestHeader\">Request Details</h2>\r\n        <table id=\"requestDetails\">\r\n            <colgroup><col id=\"label\" /><col /></colgroup>\r\n\r\n            <tr>\r\n                <th>Path</th>\r\n                <td>");
+#line 205 "DetailsPage.cshtml"
+               Write(context.Path);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Host</th>\r\n                <td>");
+#line 209 "DetailsPage.cshtml"
+               Write(context.Host);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Content Type</th>\r\n                <td>");
+#line 213 "DetailsPage.cshtml"
+               Write(context.ContentType);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Method</th>\r\n                <td>");
+#line 217 "DetailsPage.cshtml"
+               Write(context.Method);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Protocol</th>\r\n                <td>");
+#line 221 "DetailsPage.cshtml"
+               Write(context.Protocol);
+
+#line default
+#line hidden
+            WriteLiteral(@"</td>
+            </tr>
+            <tr>
+                <th>Headers</th>
+                <td id=""headerTd"">
+                    <table id=""headerTable"">
+                        <thead>
+                            <tr>
+                                <th>Variable</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+");
+#line 234 "DetailsPage.cshtml"
+                             foreach (var header in context.Headers)
+                            {
+
+#line default
+#line hidden
+            WriteLiteral("                            <tr>\r\n                                <td>");
+#line 237 "DetailsPage.cshtml"
+                               Write(header.Key);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                <td>");
+#line 238 "DetailsPage.cshtml"
+                               Write(string.Join(";", header.Value));
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                            </tr>\r\n");
+#line 240 "DetailsPage.cshtml"
+                            }
+
+#line default
+#line hidden
+            WriteLiteral("                        </tbody>\r\n                    </table>\r\n                </td>\r\n            </tr>\r\n            <tr>\r\n                <th>Status Code</th>\r\n                <td>");
+#line 247 "DetailsPage.cshtml"
+               Write(context.StatusCode);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>User</th>\r\n                <td>");
+#line 251 "DetailsPage.cshtml"
+               Write(context.User.Identity.Name);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Claims</th>\r\n                <td>\r\n");
+#line 256 "DetailsPage.cshtml"
+                     if (context.User.Claims.Any())
+                    {
+
+#line default
+#line hidden
+            WriteLiteral(@"                    <table id=""claimsTable"">
+                        <thead>
+                            <tr>
+                                <th>Issuer</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+");
+#line 266 "DetailsPage.cshtml"
+                             foreach (var claim in context.User.Claims)
+                                {
+
+#line default
+#line hidden
+            WriteLiteral("                                <tr>\r\n                                    <td>");
+#line 269 "DetailsPage.cshtml"
+                                   Write(claim.Issuer);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                    <td>");
+#line 270 "DetailsPage.cshtml"
+                                   Write(claim.Value);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                </tr>\r\n");
+#line 272 "DetailsPage.cshtml"
+                                }
+
+#line default
+#line hidden
+            WriteLiteral("                        </tbody>\r\n                    </table>\r\n");
+#line 275 "DetailsPage.cshtml"
+                    }
+
+#line default
+#line hidden
+            WriteLiteral("                </td>\r\n            </tr>\r\n            <tr>\r\n                <th>Scheme</th>\r\n                <td>");
+#line 280 "DetailsPage.cshtml"
+               Write(context.Scheme);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Query</th>\r\n                <td>");
+#line 284 "DetailsPage.cshtml"
+               Write(context.Query.Value);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n            </tr>\r\n            <tr>\r\n                <th>Cookies</th>\r\n                <td>\r\n");
+#line 289 "DetailsPage.cshtml"
+                     if (context.Cookies.Any())
+                    {
+
+#line default
+#line hidden
+            WriteLiteral(@"                    <table id=""cookieTable"">
+                        <thead>
+                            <tr>
+                                <th>Variable</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+");
+#line 299 "DetailsPage.cshtml"
+                             foreach (var cookie in context.Cookies)
+                                {
+
+#line default
+#line hidden
+            WriteLiteral("                                <tr>\r\n                                    <td>");
+#line 302 "DetailsPage.cshtml"
+                                   Write(cookie.Key);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                    <td>");
+#line 303 "DetailsPage.cshtml"
+                                   Write(string.Join(";", cookie.Value));
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                                </tr>\r\n");
+#line 305 "DetailsPage.cshtml"
+                                }
+
+#line default
+#line hidden
+            WriteLiteral("                        </tbody>\r\n                    </table>\r\n");
+#line 308 "DetailsPage.cshtml"
+                    }
+
+#line default
+#line hidden
+            WriteLiteral("                </td>\r\n            </tr>\r\n        </table>\r\n");
+#line 312 "DetailsPage.cshtml"
+    }
+
+#line default
+#line hidden
+            WriteLiteral("    <h2>Logs</h2>\r\n    <form method=\"get\">\r\n        <select name=\"level\">\r\n");
+#line 316 "DetailsPage.cshtml"
+             foreach (var severity in Enum.GetValues(typeof(LogLevel)))
+            {
+                var severityInt = (int)severity;
+                if ((int)Model.Options.MinLevel == severityInt)
+                {
+
+#line default
+#line hidden
+            WriteLiteral("                    <option");
+            BeginWriteAttribute("value", " value=\"", 8857, "\"", 8877, 1);
+#line 321 "DetailsPage.cshtml"
+WriteAttributeValue("", 8865, severityInt, 8865, 12, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            WriteLiteral(" selected=\"selected\">");
+#line 321 "DetailsPage.cshtml"
+                                                                Write(severity);
+
+#line default
+#line hidden
+            WriteLiteral("</option>\r\n");
+#line 322 "DetailsPage.cshtml"
+                }
+                else
+                {
+
+#line default
+#line hidden
+            WriteLiteral("                    <option");
+            BeginWriteAttribute("value", " value=\"", 9006, "\"", 9026, 1);
+#line 325 "DetailsPage.cshtml"
+WriteAttributeValue("", 9014, severityInt, 9014, 12, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            WriteLiteral(">");
+#line 325 "DetailsPage.cshtml"
+                                            Write(severity);
+
+#line default
+#line hidden
+            WriteLiteral("</option>\r\n");
+#line 326 "DetailsPage.cshtml"
+                }
+            }
+
+#line default
+#line hidden
+            WriteLiteral("        </select>\r\n        <input type=\"text\" name=\"name\"");
+            BeginWriteAttribute("value", " value=\"", 9139, "\"", 9172, 1);
+#line 329 "DetailsPage.cshtml"
+WriteAttributeValue("", 9147, Model.Options.NamePrefix, 9147, 25, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            WriteLiteral(@" />
+        <input type=""submit"" value=""filter"" />
+    </form>
+    <table id=""logs"">
+        <thead>
+            <tr>
+                <th>Date</th>
+                <th>Time</th>
+                <th>Severity</th>
+                <th>Name</th>
+                <th>State</th>
+                <th>Error</th>
+            </tr>
+        </thead>
+        ");
+#line 343 "DetailsPage.cshtml"
+   Write(Traverse(Model.Activity.Root));
+
+#line default
+#line hidden
+            WriteLiteral(@"
+    </table>
+    <script type=""text/javascript"">
+        $(document).ready(function () {
+            $(""#requestHeader"").click(function () {
+                $(""#requestDetails"").toggle();
+            });
+        });
+    </script>
+</body>
+</html>");
+        }
+        #pragma warning restore 1998
+#line 10 "DetailsPage.cshtml"
+ 
+    public DetailsPage(DetailsPageModel model)
+    {
+        Model = model;
+    }
+
+    public DetailsPageModel Model { get; set; }
+
+    public HelperResult LogRow(LogInfo log)
+    {
+        return new HelperResult((writer) =>
+        {
+            if (log.Severity >= Model.Options.MinLevel &&
+               (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
+            {
+                PushWriter(writer);
+                WriteLiteral("        <tr>\r\n            <td>");
+                Write(string.Format("{0:MM/dd/yy}", log.Time));
+                WriteLiteral("</td>\r\n            <td>");
+                Write(string.Format("{0:H:mm:ss}", log.Time));
+                var severity = log.Severity.ToString().ToLowerInvariant();
+                WriteLiteral($"</td>\r\n            <td class=\"{severity}\">");
+                Write(log.Severity);
+
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Name}\">");
+                Write(log.Name);
+
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Message}\""+
+                    "class=\"logState\" width=\"100px\">");
+                Write(log.Message);
+
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Exception}\">");
+                Write(log.Exception);
+
+                WriteLiteral("</td>\r\n        </tr>\r\n");
+                PopWriter();
+            }
+        });
+    }
+
+    public HelperResult Traverse(ScopeNode node)
+    {
+        return new HelperResult((writer) =>
+        {
+            var messageIndex = 0;
+            var childIndex = 0;
+            while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
+            {
+                if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
+                {
+                    LogRow(node.Messages[messageIndex]);
+                    messageIndex++;
+                }
+                else
+                {
+                    Traverse(node.Children[childIndex]);
+                    childIndex++;
+                }
+            }
+            if (messageIndex < node.Messages.Count)
+            {
+                for (var i = messageIndex; i < node.Messages.Count; i++)
+                {
+                    LogRow(node.Messages[i]);
+                }
+            }
+            else
+            {
+                for (var i = childIndex; i < node.Children.Count; i++)
+                {
+                    Traverse(node.Children[i]);
+                }
+            }
+        });
+    }
+
+#line default
+#line hidden
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
index f0519b8fee..76180ed102 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
@@ -22,25 +22,27 @@
             if (log.Severity >= Model.Options.MinLevel &&
                (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
             {
-                WriteLiteralTo(writer, "        <tr>\r\n            <td>");
-                WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time));
-                WriteLiteralTo(writer, "</td>\r\n            <td>");
-                WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time));
+                PushWriter(writer);
+                WriteLiteral("        <tr>\r\n            <td>");
+                Write(string.Format("{0:MM/dd/yy}", log.Time));
+                WriteLiteral("</td>\r\n            <td>");
+                Write(string.Format("{0:H:mm:ss}", log.Time));
                 var severity = log.Severity.ToString().ToLowerInvariant();
-                WriteLiteralTo(writer, $"</td>\r\n            <td class=\"{severity}\">");
-                WriteTo(writer, log.Severity);
+                WriteLiteral($"</td>\r\n            <td class=\"{severity}\">");
+                Write(log.Severity);
 
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Name}\">");
-                WriteTo(writer, log.Name);
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Name}\">");
+                Write(log.Name);
 
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Message}\""+
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Message}\""+
                     "class=\"logState\" width=\"100px\">");
-                WriteTo(writer, log.Message);
+                Write(log.Message);
 
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Exception}\">");
-                WriteTo(writer, log.Exception);
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Exception}\">");
+                Write(log.Exception);
 
-                WriteLiteralTo(writer, "</td>\r\n        </tr>\r\n");
+                WriteLiteral("</td>\r\n        </tr>\r\n");
+                PopWriter();
             }
         });
     }
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs
index 1fa50b2f58..1889ca3139 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.Designer.cs
@@ -1,179 +1,61 @@
+// <auto-generated/>
+#pragma warning disable 1591
 namespace Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
 {
+    #line hidden
 #line 1 "LogPage.cshtml"
-using System
+using System;
 
 #line default
 #line hidden
-    ;
-#line 2 "LogPage.cshtml"
-using System.Collections.Generic
-
-#line default
-#line hidden
-    ;
-#line 3 "LogPage.cshtml"
-using System.Globalization
-
-#line default
-#line hidden
-    ;
-#line 4 "LogPage.cshtml"
-using System.Linq
-
-#line default
-#line hidden
-    ;
-#line 5 "LogPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.Elm
-
-#line default
-#line hidden
-    ;
-#line 6 "LogPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews
-
-#line default
-#line hidden
-    ;
-#line 7 "LogPage.cshtml"
-using Microsoft.Extensions.RazorViews
-
-#line default
-#line hidden
-    ;
-#line 8 "LogPage.cshtml"
-using Microsoft.Extensions.Logging
-
-#line default
-#line hidden
-    ;
     using System.Threading.Tasks;
+#line 2 "LogPage.cshtml"
+using System.Collections.Generic;
 
+#line default
+#line hidden
+#line 3 "LogPage.cshtml"
+using System.Globalization;
+
+#line default
+#line hidden
+#line 4 "LogPage.cshtml"
+using System.Linq;
+
+#line default
+#line hidden
+#line 5 "LogPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.Elm;
+
+#line default
+#line hidden
+#line 6 "LogPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.Elm.RazorViews;
+
+#line default
+#line hidden
+#line 7 "LogPage.cshtml"
+using Microsoft.Extensions.RazorViews;
+
+#line default
+#line hidden
+#line 8 "LogPage.cshtml"
+using Microsoft.Extensions.Logging;
+
+#line default
+#line hidden
     internal class LogPage : Microsoft.Extensions.RazorViews.BaseView
     {
-#line 11 "LogPage.cshtml"
-
-    public LogPage(LogPageModel model)
-    {
-        Model = model;
-    }
-
-    public LogPageModel Model { get; set; }
-
-    public HelperResult LogRow(LogInfo log, int level)
-    {
-        return new HelperResult((writer) =>
-        {
-            if (log.Severity >= Model.Options.MinLevel &&
-                (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
-            {
-
-                WriteLiteralTo(writer, "        <tr class=\"logRow\">\r\n            <td>");
-                WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time));
-
-                WriteLiteralTo(writer, "</td>\r\n            <td>");
-                WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time));
-
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Name}\">");
-                WriteTo(writer, log.Name);
-                var severity = log.Severity.ToString().ToLowerInvariant();
-                WriteLiteralTo(writer, $"</td>\r\n            <td class=\"{severity}\">");
-                WriteTo(writer, log.Severity);
-
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Message}\"> \r\n");
-
-                for (var i = 0; i < level; i++)
-                {
-                    WriteLiteralTo(writer, "                    <span class=\"tab\"></span>\r\n");
-                }
-
-                WriteLiteralTo(writer, "                ");
-                WriteTo(writer, log.Message);
-
-                WriteLiteralTo(writer, $"\r\n            </td>\r\n            <td title=\"{log.Exception}\">");
-
-                WriteTo(writer, log.Exception);
-
-                WriteLiteralTo(writer, "</td>\r\n        </tr>\r\n");
-
-            }
-        });
-    }
-
-    public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
-    {
-        return new HelperResult((writer) => {
-            // print start of scope
-            WriteTo(writer, LogRow(new LogInfo()
-            {
-                Name = node.Name,
-                Time = node.StartTime,
-                Severity = LogLevel.Debug,
-                Message = "Beginning " + node.State,
-            }, level));
-
-            var messageIndex = 0;
-            var childIndex = 0;
-            while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
-            {
-                if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
-                {
-                    WriteTo(writer, LogRow(node.Messages[messageIndex], level));
-
-                    counts[node.Messages[messageIndex].Severity.ToString()]++;
-                    messageIndex++;
-                }
-                else
-                {
-                    WriteTo(writer, Traverse(node.Children[childIndex], level + 1, counts));
-                    childIndex++;
-                }
-            }
-            if (messageIndex < node.Messages.Count)
-            {
-                for (var i = messageIndex; i < node.Messages.Count; i++)
-                {
-                    WriteTo(writer, LogRow(node.Messages[i], level));
-                    counts[node.Messages[i].Severity.ToString()]++;
-                }
-            }
-            else
-            {
-                for (var i = childIndex; i < node.Children.Count; i++)
-                {
-                    WriteTo(writer, Traverse(node.Children[i], level + 1, counts));
-                }
-            }
-            // print end of scope
-            WriteTo(writer, LogRow(new LogInfo()
-            {
-                Name = node.Name,
-                Time = node.EndTime,
-                Severity = LogLevel.Debug,
-                Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime)
-            }, level));
-        });
-    }
-
-#line default
-#line hidden
-        #line hidden
-        public LogPage()
-        {
-        }
-
         #pragma warning disable 1998
-        public override async Task ExecuteAsync()
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral("\r\n");
-#line 114 "LogPage.cshtml"
+#line 118 "LogPage.cshtml"
   
     Response.ContentType = "text/html; charset=utf-8";
 
 #line default
 #line hidden
-
             WriteLiteral(@"
 <!DOCTYPE html>
 <html>
@@ -322,13 +204,7 @@ tr:nth-child(2n) {
 }
 ");
             WriteLiteral("\r\n.information {\r\n    color: blue;\r\n}\r\n\r\n.debug {\r\n    color: black;\r\n}\r\n\r\n.warning {\r\n    color: orange;\r\n}\r\n    </style>\r\n</head>\r\n<body>\r\n    <h1>ASP.NET Core Logs</h1>\r\n    <form id=\"viewOptions\" method=\"get\">\r\n        <select name=\"level\">\r\n");
-#line 280 "LogPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 280 "LogPage.cshtml"
+#line 284 "LogPage.cshtml"
              foreach (var severity in Enum.GetValues(typeof(LogLevel)))
             {
                 var severityInt = (int)severity;
@@ -337,56 +213,53 @@ tr:nth-child(2n) {
 
 #line default
 #line hidden
-
             WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 6825, "\"", 6845, 1);
-#line 285 "LogPage.cshtml"
-WriteAttributeValue("", 6833, severityInt, 6833, 12, false);
+            BeginWriteAttribute("value", " value=\"", 6741, "\"", 6761, 1);
+#line 289 "LogPage.cshtml"
+WriteAttributeValue("", 6749, severityInt, 6749, 12, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" selected=\"selected\">");
-#line 285 "LogPage.cshtml"
+#line 289 "LogPage.cshtml"
                                                                 Write(severity);
 
-#line default
-#line hidden
-            WriteLiteral("</option>\r\n");
-#line 286 "LogPage.cshtml"
-                }
-                else
-                {
-
-#line default
-#line hidden
-
-            WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 6974, "\"", 6994, 1);
-#line 289 "LogPage.cshtml"
-WriteAttributeValue("", 6982, severityInt, 6982, 12, false);
-
-#line default
-#line hidden
-            EndWriteAttribute();
-            WriteLiteral(">");
-#line 289 "LogPage.cshtml"
-                                            Write(severity);
-
 #line default
 #line hidden
             WriteLiteral("</option>\r\n");
 #line 290 "LogPage.cshtml"
                 }
+                else
+                {
+
+#line default
+#line hidden
+            WriteLiteral("                    <option");
+            BeginWriteAttribute("value", " value=\"", 6890, "\"", 6910, 1);
+#line 293 "LogPage.cshtml"
+WriteAttributeValue("", 6898, severityInt, 6898, 12, false);
+
+#line default
+#line hidden
+            EndWriteAttribute();
+            WriteLiteral(">");
+#line 293 "LogPage.cshtml"
+                                            Write(severity);
+
+#line default
+#line hidden
+            WriteLiteral("</option>\r\n");
+#line 294 "LogPage.cshtml"
+                }
             }
 
 #line default
 #line hidden
-
             WriteLiteral("        </select>\r\n        <input type=\"text\" name=\"name\"");
-            BeginWriteAttribute("value", " value=\"", 7107, "\"", 7140, 1);
-#line 293 "LogPage.cshtml"
-WriteAttributeValue("", 7115, Model.Options.NamePrefix, 7115, 25, false);
+            BeginWriteAttribute("value", " value=\"", 7023, "\"", 7056, 1);
+#line 297 "LogPage.cshtml"
+WriteAttributeValue("", 7031, Model.Options.NamePrefix, 7031, 25, false);
 
 #line default
 #line hidden
@@ -416,27 +289,14 @@ WriteAttributeValue("", 7115, Model.Options.NamePrefix, 7115, 25, false);
             <col />
         </colgroup>
 ");
-#line 317 "LogPage.cshtml"
-        
-
-#line default
-#line hidden
-
-#line 317 "LogPage.cshtml"
+#line 321 "LogPage.cshtml"
          foreach (var activity in Model.Activities.Reverse())
         {
 
 #line default
 #line hidden
-
             WriteLiteral("            <tbody>\r\n                <tr class=\"requestRow\">\r\n");
-#line 321 "LogPage.cshtml"
-                    
-
-#line default
-#line hidden
-
-#line 321 "LogPage.cshtml"
+#line 325 "LogPage.cshtml"
                       
                         var activityPath = Model.Path.Value + "/" + activity.Id;
                         if (activity.HttpInfo != null)
@@ -444,101 +304,97 @@ WriteAttributeValue("", 7115, Model.Options.NamePrefix, 7115, 25, false);
 
 #line default
 #line hidden
-
             WriteLiteral("                        \t<td><a");
-            BeginWriteAttribute("href", " href=\"", 8204, "\"", 8224, 1);
-#line 325 "LogPage.cshtml"
-WriteAttributeValue("", 8211, activityPath, 8211, 13, false);
+            BeginWriteAttribute("href", " href=\"", 8120, "\"", 8140, 1);
+#line 329 "LogPage.cshtml"
+WriteAttributeValue("", 8127, activityPath, 8127, 13, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 8225, "\"", 8256, 1);
-#line 325 "LogPage.cshtml"
-WriteAttributeValue("", 8233, activity.HttpInfo.Path, 8233, 23, false);
+            BeginWriteAttribute("title", " title=\"", 8141, "\"", 8172, 1);
+#line 329 "LogPage.cshtml"
+WriteAttributeValue("", 8149, activity.HttpInfo.Path, 8149, 23, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">");
-#line 325 "LogPage.cshtml"
+#line 329 "LogPage.cshtml"
                                                                                    Write(activity.HttpInfo.Path);
 
 #line default
 #line hidden
             WriteLiteral("</a></td>\r\n                            <td>");
-#line 326 "LogPage.cshtml"
+#line 330 "LogPage.cshtml"
                            Write(activity.HttpInfo.Method);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                            <td>");
-#line 327 "LogPage.cshtml"
+#line 331 "LogPage.cshtml"
                            Write(activity.HttpInfo.Host);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                            <td>");
-#line 328 "LogPage.cshtml"
+#line 332 "LogPage.cshtml"
                            Write(activity.HttpInfo.StatusCode);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n");
-#line 329 "LogPage.cshtml"
+#line 333 "LogPage.cshtml"
                         }
                         else if (activity.RepresentsScope)
                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                            <td colspan=\"4\"><a");
-            BeginWriteAttribute("href", " href=\"", 8646, "\"", 8666, 1);
-#line 332 "LogPage.cshtml"
-WriteAttributeValue("", 8653, activityPath, 8653, 13, false);
+            BeginWriteAttribute("href", " href=\"", 8562, "\"", 8582, 1);
+#line 336 "LogPage.cshtml"
+WriteAttributeValue("", 8569, activityPath, 8569, 13, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 8667, "\"", 8695, 1);
-#line 332 "LogPage.cshtml"
-WriteAttributeValue("", 8675, activity.Root.State, 8675, 20, false);
+            BeginWriteAttribute("title", " title=\"", 8583, "\"", 8611, 1);
+#line 336 "LogPage.cshtml"
+WriteAttributeValue("", 8591, activity.Root.State, 8591, 20, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">");
-#line 332 "LogPage.cshtml"
+#line 336 "LogPage.cshtml"
                                                                                             Write(activity.Root.State);
 
 #line default
 #line hidden
             WriteLiteral("</a></td>\r\n");
-#line 333 "LogPage.cshtml"
+#line 337 "LogPage.cshtml"
                         }
                         else
                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                            <td colspan=\"4\"><a");
-            BeginWriteAttribute("href", " href=\"", 8858, "\"", 8878, 1);
-#line 336 "LogPage.cshtml"
-WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
+            BeginWriteAttribute("href", " href=\"", 8774, "\"", 8794, 1);
+#line 340 "LogPage.cshtml"
+WriteAttributeValue("", 8781, activityPath, 8781, 13, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">Non-scope Log</a></td>\r\n");
-#line 337 "LogPage.cshtml"
+#line 341 "LogPage.cshtml"
                         }
                     
 
 #line default
 #line hidden
-
             WriteLiteral(@"                    <td class=""logTd"">
                         <table class=""logTable"">
                             <thead class=""logHeader"">
@@ -552,13 +408,7 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
                                 </tr>
                             </thead>
 ");
-#line 351 "LogPage.cshtml"
-                            
-
-#line default
-#line hidden
-
-#line 351 "LogPage.cshtml"
+#line 355 "LogPage.cshtml"
                               
                                 var counts = new Dictionary<string, int>();
                                 counts["Critical"] = 0;
@@ -570,15 +420,8 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
 
 #line default
 #line hidden
-
             WriteLiteral("                            <tbody class=\"logBody\">\r\n");
-#line 360 "LogPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 360 "LogPage.cshtml"
+#line 364 "LogPage.cshtml"
                                  if (!activity.RepresentsScope)
                                 {
                                     // message not within a scope
@@ -587,13 +430,12 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
 
 #line default
 #line hidden
-
-#line 364 "LogPage.cshtml"
+#line 368 "LogPage.cshtml"
                                Write(LogRow(logInfo, 0));
 
 #line default
 #line hidden
-#line 364 "LogPage.cshtml"
+#line 368 "LogPage.cshtml"
                                                        
                                     counts[logInfo.Severity.ToString()] = 1;
                                 }
@@ -603,88 +445,76 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
 
 #line default
 #line hidden
-
-#line 369 "LogPage.cshtml"
+#line 373 "LogPage.cshtml"
                                Write(Traverse(activity.Root, 0, counts));
 
 #line default
 #line hidden
-#line 369 "LogPage.cshtml"
+#line 373 "LogPage.cshtml"
                                                                        
                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                            </tbody>\r\n                            <tbody class=\"summary\">\r\n                                <tr class=\"logRow\">\r\n                                    <td>");
-#line 374 "LogPage.cshtml"
+#line 378 "LogPage.cshtml"
                                    Write(activity.Time.ToString("MM-dd-yyyy HH:mm:ss"));
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n");
-#line 375 "LogPage.cshtml"
-                                    
-
-#line default
-#line hidden
-
-#line 375 "LogPage.cshtml"
+#line 379 "LogPage.cshtml"
                                      foreach (var kvp in counts)
                                     {
                                         if (string.Equals("Debug", kvp.Key)) {
 
 #line default
 #line hidden
-
             WriteLiteral("                                            <td>");
-#line 378 "LogPage.cshtml"
+#line 382 "LogPage.cshtml"
                                            Write(kvp.Value);
 
 #line default
 #line hidden
             WriteLiteral(" ");
-#line 378 "LogPage.cshtml"
+#line 382 "LogPage.cshtml"
                                                       Write(kvp.Key);
 
 #line default
 #line hidden
             WriteLiteral("<span class=\"collapse\">v</span></td>\r\n");
-#line 379 "LogPage.cshtml"
+#line 383 "LogPage.cshtml"
                                         }
                                         else
                                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                                            <td>");
-#line 382 "LogPage.cshtml"
+#line 386 "LogPage.cshtml"
                                            Write(kvp.Value);
 
 #line default
 #line hidden
             WriteLiteral(" ");
-#line 382 "LogPage.cshtml"
+#line 386 "LogPage.cshtml"
                                                       Write(kvp.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n");
-#line 383 "LogPage.cshtml"
+#line 387 "LogPage.cshtml"
                                         }
                                     }
 
 #line default
 #line hidden
-
             WriteLiteral("                                </tr>\r\n                            </tbody>\r\n                        </table>\r\n                    </td>\r\n                </tr>\r\n            </tbody>\r\n");
-#line 391 "LogPage.cshtml"
+#line 395 "LogPage.cshtml"
         }
 
 #line default
 #line hidden
-
             WriteLiteral(@"    </table>
     <script type=""text/javascript"">
         $(document).ready(function () {
@@ -706,5 +536,116 @@ WriteAttributeValue("", 8865, activityPath, 8865, 13, false);
 </html>");
         }
         #pragma warning restore 1998
+#line 11 "LogPage.cshtml"
+ 
+    public LogPage(LogPageModel model)
+    {
+        Model = model;
+    }
+
+    public LogPageModel Model { get; set; }
+
+    public HelperResult LogRow(LogInfo log, int level)
+    {
+        return new HelperResult((writer) =>
+        {
+            if (log.Severity >= Model.Options.MinLevel &&
+                (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
+            {
+                PushWriter(writer);
+                WriteLiteral("        <tr class=\"logRow\">\r\n            <td>");
+                Write(string.Format("{0:MM/dd/yy}", log.Time));
+
+                WriteLiteral("</td>\r\n            <td>");
+                Write(string.Format("{0:H:mm:ss}", log.Time));
+
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Name}\">");
+                Write(log.Name);
+                var severity = log.Severity.ToString().ToLowerInvariant();
+                WriteLiteral($"</td>\r\n            <td class=\"{severity}\">");
+                Write(log.Severity);
+
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Message}\"> \r\n");
+
+                for (var i = 0; i < level; i++)
+                {
+                    WriteLiteral("                    <span class=\"tab\"></span>\r\n");
+                }
+
+                WriteLiteral("                ");
+                Write(log.Message);
+
+                WriteLiteral($"\r\n            </td>\r\n            <td title=\"{log.Exception}\">");
+
+                Write(log.Exception);
+
+                WriteLiteral("</td>\r\n        </tr>\r\n");
+                PopWriter();
+            }
+        });
+    }
+
+    public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
+    {
+        return new HelperResult((writer) => {
+            PushWriter(writer);
+
+            // print start of scope
+            Write(LogRow(new LogInfo()
+            {
+                Name = node.Name,
+                Time = node.StartTime,
+                Severity = LogLevel.Debug,
+                Message = "Beginning " + node.State,
+            }, level));
+
+            var messageIndex = 0;
+            var childIndex = 0;
+            while (messageIndex < node.Messages.Count && childIndex < node.Children.Count)
+            {
+                if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
+                {
+                    Write(LogRow(node.Messages[messageIndex], level));
+
+                    counts[node.Messages[messageIndex].Severity.ToString()]++;
+                    messageIndex++;
+                }
+                else
+                {
+                    Write(Traverse(node.Children[childIndex], level + 1, counts));
+                    childIndex++;
+                }
+            }
+            if (messageIndex < node.Messages.Count)
+            {
+                for (var i = messageIndex; i < node.Messages.Count; i++)
+                {
+                    Write(LogRow(node.Messages[i], level));
+                    counts[node.Messages[i].Severity.ToString()]++;
+                }
+            }
+            else
+            {
+                for (var i = childIndex; i < node.Children.Count; i++)
+                {
+                    Write(Traverse(node.Children[i], level + 1, counts));
+                }
+            }
+            // print end of scope
+            Write(LogRow(new LogInfo()
+            {
+                Name = node.Name,
+                Time = node.EndTime,
+                Severity = LogLevel.Debug,
+                Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime)
+            }, level));
+
+            PopWriter();
+        });
+    }
+
+#line default
+#line hidden
     }
 }
+#pragma warning restore 1591
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
index 870a3579c5..4209d6a100 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
@@ -23,35 +23,35 @@
             if (log.Severity >= Model.Options.MinLevel &&
                 (string.IsNullOrEmpty(Model.Options.NamePrefix) || log.Name.StartsWith(Model.Options.NamePrefix, StringComparison.Ordinal)))
             {
+                PushWriter(writer);
+                WriteLiteral("        <tr class=\"logRow\">\r\n            <td>");
+                Write(string.Format("{0:MM/dd/yy}", log.Time));
 
-                WriteLiteralTo(writer, "        <tr class=\"logRow\">\r\n            <td>");
-                WriteTo(writer, string.Format("{0:MM/dd/yy}", log.Time));
+                WriteLiteral("</td>\r\n            <td>");
+                Write(string.Format("{0:H:mm:ss}", log.Time));
 
-                WriteLiteralTo(writer, "</td>\r\n            <td>");
-                WriteTo(writer, string.Format("{0:H:mm:ss}", log.Time));
-
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Name}\">");
-                WriteTo(writer, log.Name);
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Name}\">");
+                Write(log.Name);
                 var severity = log.Severity.ToString().ToLowerInvariant();
-                WriteLiteralTo(writer, $"</td>\r\n            <td class=\"{severity}\">");
-                WriteTo(writer, log.Severity);
+                WriteLiteral($"</td>\r\n            <td class=\"{severity}\">");
+                Write(log.Severity);
 
-                WriteLiteralTo(writer, $"</td>\r\n            <td title=\"{log.Message}\"> \r\n");
+                WriteLiteral($"</td>\r\n            <td title=\"{log.Message}\"> \r\n");
 
                 for (var i = 0; i < level; i++)
                 {
-                    WriteLiteralTo(writer, "                    <span class=\"tab\"></span>\r\n");
+                    WriteLiteral("                    <span class=\"tab\"></span>\r\n");
                 }
 
-                WriteLiteralTo(writer, "                ");
-                WriteTo(writer, log.Message);
+                WriteLiteral("                ");
+                Write(log.Message);
 
-                WriteLiteralTo(writer, $"\r\n            </td>\r\n            <td title=\"{log.Exception}\">");
+                WriteLiteral($"\r\n            </td>\r\n            <td title=\"{log.Exception}\">");
 
-                WriteTo(writer, log.Exception);
-
-                WriteLiteralTo(writer, "</td>\r\n        </tr>\r\n");
+                Write(log.Exception);
 
+                WriteLiteral("</td>\r\n        </tr>\r\n");
+                PopWriter();
             }
         });
     }
@@ -59,8 +59,10 @@
     public HelperResult Traverse(ScopeNode node, int level, Dictionary<string, int> counts)
     {
         return new HelperResult((writer) => {
+            PushWriter(writer);
+
             // print start of scope
-            WriteTo(writer, LogRow(new LogInfo()
+            Write(LogRow(new LogInfo()
             {
                 Name = node.Name,
                 Time = node.StartTime,
@@ -74,14 +76,14 @@
             {
                 if (node.Messages[messageIndex].Time < node.Children[childIndex].StartTime)
                 {
-                    WriteTo(writer, LogRow(node.Messages[messageIndex], level));
+                    Write(LogRow(node.Messages[messageIndex], level));
 
                     counts[node.Messages[messageIndex].Severity.ToString()]++;
                     messageIndex++;
                 }
                 else
                 {
-                    WriteTo(writer, Traverse(node.Children[childIndex], level + 1, counts));
+                    Write(Traverse(node.Children[childIndex], level + 1, counts));
                     childIndex++;
                 }
             }
@@ -89,7 +91,7 @@
             {
                 for (var i = messageIndex; i < node.Messages.Count; i++)
                 {
-                    WriteTo(writer, LogRow(node.Messages[i], level));
+                    Write(LogRow(node.Messages[i], level));
                     counts[node.Messages[i].Severity.ToString()]++;
                 }
             }
@@ -97,17 +99,19 @@
             {
                 for (var i = childIndex; i < node.Children.Count; i++)
                 {
-                    WriteTo(writer, Traverse(node.Children[i], level + 1, counts));
+                    Write(Traverse(node.Children[i], level + 1, counts));
                 }
             }
             // print end of scope
-            WriteTo(writer, LogRow(new LogInfo()
+            Write(LogRow(new LogInfo()
             {
                 Name = node.Name,
                 Time = node.EndTime,
                 Severity = LogLevel.Debug,
                 Message = string.Format("Completed {0} in {1}ms", node.State, node.EndTime - node.StartTime)
             }, level));
+
+            PopWriter();
         });
     }
 }
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs
index 57fa3e8fac..b9a3641004 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.Designer.cs
@@ -1,56 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
 namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
 {
+    #line hidden
 #line 1 "DatabaseErrorPage.cshtml"
-using System
+using System;
 
 #line default
 #line hidden
-    ;
-#line 2 "DatabaseErrorPage.cshtml"
-using System.Linq
-
-#line default
-#line hidden
-    ;
-#line 3 "DatabaseErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
-
-#line default
-#line hidden
-    ;
-#line 4 "DatabaseErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
-
-#line default
-#line hidden
-    ;
     using System.Threading.Tasks;
+#line 2 "DatabaseErrorPage.cshtml"
+using System.Linq;
 
+#line default
+#line hidden
+#line 3 "DatabaseErrorPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
+
+#line default
+#line hidden
+#line 4 "DatabaseErrorPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views;
+
+#line default
+#line hidden
     internal class DatabaseErrorPage : Microsoft.Extensions.RazorViews.BaseView
     {
-#line 11 "DatabaseErrorPage.cshtml"
-
-    public DatabaseErrorPageModel Model { get; set; }
-
-    public string UrlEncode(string content)
-    {
-        return UrlEncoder.Encode(content);
-    }
-
-    public string JavaScriptEncode(string content)
-    {
-        return JavaScriptEncoder.Encode(content);
-    }
-
-#line default
-#line hidden
-        #line hidden
-        public DatabaseErrorPage()
-        {
-        }
-
         #pragma warning disable 1998
-        public override async Task ExecuteAsync()
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
 #line 5 "DatabaseErrorPage.cshtml"
   
@@ -60,7 +37,6 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
 
 #line default
 #line hidden
-
             WriteLiteral(@"<!DOCTYPE html>
 
 <html lang=""en"" xmlns=""http://www.w3.org/1999/xhtml"">
@@ -158,19 +134,12 @@ body .titleerror {
 #line default
 #line hidden
             WriteLiteral("</h1>\r\n    <p>\r\n");
-#line 115 "DatabaseErrorPage.cshtml"
-        
-
-#line default
-#line hidden
-
 #line 115 "DatabaseErrorPage.cshtml"
          for (Exception ex = Model.Exception; ex != null; ex = ex.InnerException)
             {
 
 #line default
 #line hidden
-
             WriteLiteral("            <span>");
 #line 117 "DatabaseErrorPage.cshtml"
              Write(ex.GetType().Name);
@@ -189,21 +158,13 @@ body .titleerror {
 
 #line default
 #line hidden
-
             WriteLiteral("    </p>\r\n    <hr />\r\n\r\n");
-#line 123 "DatabaseErrorPage.cshtml"
-    
-
-#line default
-#line hidden
-
 #line 123 "DatabaseErrorPage.cshtml"
      if (!Model.DatabaseExists && !Model.PendingMigrations.Any())
     {
 
 #line default
 #line hidden
-
             WriteLiteral("        <h2>");
 #line 125 "DatabaseErrorPage.cshtml"
        Write(Strings.FormatDatabaseErrorPage_NoDbOrMigrationsTitle(Model.ContextType.Name));
@@ -254,7 +215,6 @@ body .titleerror {
 
 #line default
 #line hidden
-
             WriteLiteral("        <div>\r\n            <h2>");
 #line 139 "DatabaseErrorPage.cshtml"
            Write(Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name));
@@ -268,19 +228,12 @@ body .titleerror {
 #line default
 #line hidden
             WriteLiteral("</p>\r\n\r\n            <ul>\r\n");
-#line 143 "DatabaseErrorPage.cshtml"
-                
-
-#line default
-#line hidden
-
 #line 143 "DatabaseErrorPage.cshtml"
                  foreach (var migration in Model.PendingMigrations)
                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                    <li>");
 #line 145 "DatabaseErrorPage.cshtml"
                    Write(migration);
@@ -293,7 +246,6 @@ body .titleerror {
 
 #line default
 #line hidden
-
             WriteLiteral("            </ul>\r\n\r\n            <p>\r\n                <button id=\"applyMigrations\" onclick=\"ApplyMigrations()\">");
 #line 150 "DatabaseErrorPage.cshtml"
                                                                     Write(Strings.DatabaseErrorPage_ApplyMigrationsButton);
@@ -400,7 +352,6 @@ body .titleerror {
 
 #line default
 #line hidden
-
             WriteLiteral("        <div>\r\n            <h2>");
 #line 200 "DatabaseErrorPage.cshtml"
            Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name));
@@ -449,9 +400,25 @@ body .titleerror {
 
 #line default
 #line hidden
-
             WriteLiteral("</body>\r\n</html>");
         }
         #pragma warning restore 1998
+#line 11 "DatabaseErrorPage.cshtml"
+ 
+    public DatabaseErrorPageModel Model { get; set; }
+
+    public string UrlEncode(string content)
+    {
+        return UrlEncoder.Encode(content);
+    }
+
+    public string JavaScriptEncode(string content)
+    {
+        return JavaScriptEncoder.Encode(content);
+    }
+
+#line default
+#line hidden
     }
 }
+#pragma warning restore 1591
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs
index 01bf824655..d5342bf79a 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.Designer.cs
@@ -1,58 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
 namespace Microsoft.AspNetCore.Diagnostics.RazorViews
 {
+    #line hidden
 #line 1 "CompilationErrorPage.cshtml"
-using System
+using System;
 
 #line default
 #line hidden
-    ;
-#line 2 "CompilationErrorPage.cshtml"
-using System.Globalization
-
-#line default
-#line hidden
-    ;
-#line 3 "CompilationErrorPage.cshtml"
-using System.Linq
-
-#line default
-#line hidden
-    ;
-#line 4 "CompilationErrorPage.cshtml"
-using System.Net
-
-#line default
-#line hidden
-    ;
-#line 5 "CompilationErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics
-
-#line default
-#line hidden
-    ;
-#line 6 "CompilationErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.RazorViews
-
-#line default
-#line hidden
-    ;
     using System.Threading.Tasks;
+#line 2 "CompilationErrorPage.cshtml"
+using System.Globalization;
 
+#line default
+#line hidden
+#line 3 "CompilationErrorPage.cshtml"
+using System.Linq;
+
+#line default
+#line hidden
+#line 4 "CompilationErrorPage.cshtml"
+using System.Net;
+
+#line default
+#line hidden
+#line 5 "CompilationErrorPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics;
+
+#line default
+#line hidden
+#line 6 "CompilationErrorPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.RazorViews;
+
+#line default
+#line hidden
     internal class CompilationErrorPage : Microsoft.Extensions.RazorViews.BaseView
     {
-#line 8 "CompilationErrorPage.cshtml"
-
-    public CompilationErrorPageModel Model { get; set; }
-
-#line default
-#line hidden
-        #line hidden
-        public CompilationErrorPage()
-        {
-        }
-
         #pragma warning disable 1998
-        public override async Task ExecuteAsync()
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
 #line 11 "CompilationErrorPage.cshtml"
   
@@ -62,7 +47,6 @@ using Microsoft.AspNetCore.Diagnostics.RazorViews
 
 #line default
 #line hidden
-
             WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n    <head>\r\n        <meta charset=\"utf-8\" />\r\n        <title>");
 #line 20 "CompilationErrorPage.cshtml"
           Write(Resources.ErrorPageHtml_Title);
@@ -281,12 +265,6 @@ a {
 #line default
 #line hidden
             WriteLiteral("</h1>\r\n");
-#line 223 "CompilationErrorPage.cshtml"
-        
-
-#line default
-#line hidden
-
 #line 223 "CompilationErrorPage.cshtml"
           
             var exceptionDetailId = "";
@@ -294,7 +272,6 @@ a {
 
 #line default
 #line hidden
-
             WriteLiteral("        ");
 #line 226 "CompilationErrorPage.cshtml"
          for (var i = 0; i < Model.ErrorDetails.Count; i++)
@@ -305,362 +282,257 @@ a {
 
 #line default
 #line hidden
-
             WriteLiteral("            <div id=\"stackpage\" class=\"page\">\r\n");
-#line 232 "CompilationErrorPage.cshtml"
-                
-
-#line default
-#line hidden
-
 #line 232 "CompilationErrorPage.cshtml"
                   
                     var stackFrameCount = 0;
                     var frameId = "";
-                 
-
-#line default
-#line hidden
-
-            WriteLiteral("                ");
-#line 236 "CompilationErrorPage.cshtml"
-                  
                     var fileName = errorDetail.StackFrames.FirstOrDefault()?.File;
                     if (!string.IsNullOrEmpty(fileName))
                     {
 
 #line default
 #line hidden
-
             WriteLiteral("                        <div class=\"titleerror\">");
-#line 240 "CompilationErrorPage.cshtml"
+#line 238 "CompilationErrorPage.cshtml"
                                            Write(fileName);
 
 #line default
 #line hidden
             WriteLiteral("</div>\r\n");
-#line 241 "CompilationErrorPage.cshtml"
+#line 239 "CompilationErrorPage.cshtml"
                     }
                 
 
 #line default
 #line hidden
-
             WriteLiteral("                ");
-#line 243 "CompilationErrorPage.cshtml"
+#line 241 "CompilationErrorPage.cshtml"
                  if (!string.IsNullOrEmpty(errorDetail.ErrorMessage))
                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                    <div class=\"details\">");
-#line 245 "CompilationErrorPage.cshtml"
+#line 243 "CompilationErrorPage.cshtml"
                                     Write(errorDetail.ErrorMessage);
 
 #line default
 #line hidden
             WriteLiteral("</div>\r\n");
-#line 246 "CompilationErrorPage.cshtml"
+#line 244 "CompilationErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                <br />\r\n                <ul>\r\n");
-#line 249 "CompilationErrorPage.cshtml"
-                
-
-#line default
-#line hidden
-
-#line 249 "CompilationErrorPage.cshtml"
+#line 247 "CompilationErrorPage.cshtml"
                  foreach (var frame in errorDetail.StackFrames)
                 {
-                    
+                    stackFrameCount++;
+                    frameId = "frame" + stackFrameCount;
+
 
 #line default
 #line hidden
-
-#line 251 "CompilationErrorPage.cshtml"
-                      
-                        stackFrameCount++;
-                        frameId = "frame" + stackFrameCount;
-                    
-
-#line default
-#line hidden
-
-#line 254 "CompilationErrorPage.cshtml"
-                     
-
-#line default
-#line hidden
-
             WriteLiteral("                    <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 5361, "\"", 5374, 1);
-#line 255 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 5366, frameId, 5366, 8, false);
+            BeginWriteAttribute("id", " id=\"", 5268, "\"", 5281, 1);
+#line 252 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 5273, frameId, 5273, 8, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">\r\n");
-#line 256 "CompilationErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 256 "CompilationErrorPage.cshtml"
+#line 253 "CompilationErrorPage.cshtml"
                          if (!string.IsNullOrEmpty(frame.ErrorDetails))
                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                            <h3>");
-#line 258 "CompilationErrorPage.cshtml"
+#line 255 "CompilationErrorPage.cshtml"
                            Write(frame.ErrorDetails);
 
 #line default
 #line hidden
             WriteLiteral("</h3>\r\n");
-#line 259 "CompilationErrorPage.cshtml"
+#line 256 "CompilationErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
             WriteLiteral("\r\n");
-#line 261 "CompilationErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 261 "CompilationErrorPage.cshtml"
+#line 258 "CompilationErrorPage.cshtml"
                          if (frame.Line != 0 && frame.ContextCode.Any())
                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                            <button class=\"expandCollapseButton\" data-frameId=\"");
-#line 263 "CompilationErrorPage.cshtml"
+#line 260 "CompilationErrorPage.cshtml"
                                                                           Write(frameId);
 
 #line default
 #line hidden
             WriteLiteral("\">+</button>\r\n                            <div class=\"source\">\r\n");
-#line 265 "CompilationErrorPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 265 "CompilationErrorPage.cshtml"
+#line 262 "CompilationErrorPage.cshtml"
                                  if (frame.PreContextCode.Any())
                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                    <ol");
-            BeginWriteAttribute("start", " start=\"", 5957, "\"", 5986, 1);
-#line 267 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 5965, frame.PreContextLine, 5965, 21, false);
+            BeginWriteAttribute("start", " start=\"", 5864, "\"", 5893, 1);
+#line 264 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 5872, frame.PreContextLine, 5872, 21, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 268 "CompilationErrorPage.cshtml"
-                                        
-
-#line default
-#line hidden
-
-#line 268 "CompilationErrorPage.cshtml"
+#line 265 "CompilationErrorPage.cshtml"
                                          foreach (var line in frame.PreContextCode)
                                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                                            <li><span>");
-#line 270 "CompilationErrorPage.cshtml"
+#line 267 "CompilationErrorPage.cshtml"
                                                  Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 271 "CompilationErrorPage.cshtml"
+#line 268 "CompilationErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                                    </ol>\r\n");
-#line 273 "CompilationErrorPage.cshtml"
+#line 270 "CompilationErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                                <ol");
-            BeginWriteAttribute("start", " start=\"", 6367, "\"", 6386, 1);
-#line 274 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 6375, frame.Line, 6375, 11, false);
+            BeginWriteAttribute("start", " start=\"", 6274, "\"", 6293, 1);
+#line 271 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 6282, frame.Line, 6282, 11, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"highlight\">\r\n");
-#line 275 "CompilationErrorPage.cshtml"
-                                    
-
-#line default
-#line hidden
-
-#line 275 "CompilationErrorPage.cshtml"
+#line 272 "CompilationErrorPage.cshtml"
                                      foreach (var line in frame.ContextCode)
                                     {
 
 #line default
 #line hidden
-
             WriteLiteral("                                        <li><span>");
-#line 277 "CompilationErrorPage.cshtml"
+#line 274 "CompilationErrorPage.cshtml"
                                              Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 278 "CompilationErrorPage.cshtml"
+#line 275 "CompilationErrorPage.cshtml"
                                     }
 
 #line default
 #line hidden
-
             WriteLiteral("                                </ol>\r\n");
-#line 280 "CompilationErrorPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 280 "CompilationErrorPage.cshtml"
+#line 277 "CompilationErrorPage.cshtml"
                                  if (frame.PostContextCode.Any())
                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                    <ol");
-            BeginWriteAttribute("start", " start=\'", 6813, "\'", 6838, 1);
-#line 282 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 6821, frame.Line + 1, 6821, 17, false);
+            BeginWriteAttribute("start", " start=\'", 6720, "\'", 6745, 1);
+#line 279 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 6728, frame.Line + 1, 6728, 17, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 283 "CompilationErrorPage.cshtml"
-                                        
-
-#line default
-#line hidden
-
-#line 283 "CompilationErrorPage.cshtml"
+#line 280 "CompilationErrorPage.cshtml"
                                          foreach (var line in frame.PostContextCode)
                                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                                            <li><span>");
-#line 285 "CompilationErrorPage.cshtml"
+#line 282 "CompilationErrorPage.cshtml"
                                                  Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 286 "CompilationErrorPage.cshtml"
+#line 283 "CompilationErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                                    </ol>\r\n");
-#line 288 "CompilationErrorPage.cshtml"
+#line 285 "CompilationErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                            </div>\r\n");
-#line 290 "CompilationErrorPage.cshtml"
+#line 287 "CompilationErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                    </li>\r\n");
-#line 292 "CompilationErrorPage.cshtml"
+#line 289 "CompilationErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                </ul>\r\n                <br />\r\n            </div>\r\n");
-#line 296 "CompilationErrorPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 296 "CompilationErrorPage.cshtml"
+#line 293 "CompilationErrorPage.cshtml"
              if (!string.IsNullOrEmpty(Model.CompiledContent[i]))
-            { 
+            {
 
 #line default
 #line hidden
-
             WriteLiteral("                <div class=\"rawExceptionBlock\">\r\n                    <div class=\"showRawExceptionContainer\">\r\n                        <button class=\"showRawException\" data-exceptionDetailId=\"");
-#line 300 "CompilationErrorPage.cshtml"
+#line 297 "CompilationErrorPage.cshtml"
                                                                             Write(exceptionDetailId);
 
 #line default
 #line hidden
             WriteLiteral("\">Show compilation source</button>\r\n                    </div>\r\n                    <div");
-            BeginWriteAttribute("id", " id=\"", 7741, "\"", 7764, 1);
-#line 302 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 7746, exceptionDetailId, 7746, 18, false);
+            BeginWriteAttribute("id", " id=\"", 7647, "\"", 7670, 1);
+#line 299 "CompilationErrorPage.cshtml"
+WriteAttributeValue("", 7652, exceptionDetailId, 7652, 18, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"rawExceptionDetails\">\r\n                        <pre class=\"rawExceptionStackTrace\">");
-#line 303 "CompilationErrorPage.cshtml"
+#line 300 "CompilationErrorPage.cshtml"
                                                        Write(Model.CompiledContent[i]);
 
 #line default
 #line hidden
             WriteLiteral("</pre>\r\n                    </div>\r\n                </div>\r\n");
-#line 306 "CompilationErrorPage.cshtml"
+#line 303 "CompilationErrorPage.cshtml"
             }
 
 #line default
 #line hidden
-
-#line 306 "CompilationErrorPage.cshtml"
+#line 303 "CompilationErrorPage.cshtml"
              
         }
 
 #line default
 #line hidden
-
             WriteLiteral(@"
         <script>
             //<!--
@@ -868,5 +740,12 @@ WriteAttributeValue("", 7746, exceptionDetailId, 7746, 18, false);
 ");
         }
         #pragma warning restore 1998
+#line 8 "CompilationErrorPage.cshtml"
+ 
+    public CompilationErrorPageModel Model { get; set; }
+
+#line default
+#line hidden
     }
 }
+#pragma warning restore 1591
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
index 9d0e0bdeed..961c6bedbb 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
@@ -36,8 +36,6 @@
                 @{
                     var stackFrameCount = 0;
                     var frameId = "";
-                 }
-                @{
                     var fileName = errorDetail.StackFrames.FirstOrDefault()?.File;
                     if (!string.IsNullOrEmpty(fileName))
                     {
@@ -52,10 +50,9 @@
                 <ul>
                 @foreach (var frame in errorDetail.StackFrames)
                 {
-                    @{
-                        stackFrameCount++;
-                        frameId = "frame" + stackFrameCount;
-                    }
+                    stackFrameCount++;
+                    frameId = "frame" + stackFrameCount;
+
                     <li class="frame" id="@frameId">
                         @if (!string.IsNullOrEmpty(frame.ErrorDetails))
                         {
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs
index 3b50340dbf..ea4969b0ed 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.Designer.cs
@@ -1,69 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
 namespace Microsoft.AspNetCore.Diagnostics.RazorViews
 {
+    #line hidden
 #line 1 "ErrorPage.cshtml"
-using System
+using System;
 
 #line default
 #line hidden
-    ;
-#line 2 "ErrorPage.cshtml"
-using System.Globalization
-
-#line default
-#line hidden
-    ;
-#line 3 "ErrorPage.cshtml"
-using System.Linq
-
-#line default
-#line hidden
-    ;
-#line 4 "ErrorPage.cshtml"
-using System.Net
-
-#line default
-#line hidden
-    ;
-#line 5 "ErrorPage.cshtml"
-using System.Reflection
-
-#line default
-#line hidden
-    ;
-#line 6 "ErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics.RazorViews
-
-#line default
-#line hidden
-    ;
-#line 7 "ErrorPage.cshtml"
-using Microsoft.AspNetCore.Diagnostics
-
-#line default
-#line hidden
-    ;
     using System.Threading.Tasks;
+#line 2 "ErrorPage.cshtml"
+using System.Globalization;
 
+#line default
+#line hidden
+#line 3 "ErrorPage.cshtml"
+using System.Linq;
+
+#line default
+#line hidden
+#line 4 "ErrorPage.cshtml"
+using System.Net;
+
+#line default
+#line hidden
+#line 5 "ErrorPage.cshtml"
+using System.Reflection;
+
+#line default
+#line hidden
+#line 6 "ErrorPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics.RazorViews;
+
+#line default
+#line hidden
+#line 7 "ErrorPage.cshtml"
+using Microsoft.AspNetCore.Diagnostics;
+
+#line default
+#line hidden
     internal class ErrorPage : Microsoft.Extensions.RazorViews.BaseView
     {
-#line 9 "ErrorPage.cshtml"
-
-    public ErrorPage(ErrorPageModel model)
-    {
-        Model = model;
-    }
-
-    public ErrorPageModel Model { get; set; }
-
-#line default
-#line hidden
-        #line hidden
-        public ErrorPage()
-        {
-        }
-
         #pragma warning disable 1998
-        public override async Task ExecuteAsync()
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
 #line 17 "ErrorPage.cshtml"
   
@@ -73,7 +52,6 @@ using Microsoft.AspNetCore.Diagnostics
 
 #line default
 #line hidden
-
             WriteLiteral("<!DOCTYPE html>\r\n<html");
             BeginWriteAttribute("lang", " lang=\"", 536, "\"", 597, 1);
 #line 23 "ErrorPage.cshtml"
@@ -300,19 +278,12 @@ a {
 #line default
 #line hidden
             WriteLiteral("</h1>\r\n");
-#line 229 "ErrorPage.cshtml"
-        
-
-#line default
-#line hidden
-
 #line 229 "ErrorPage.cshtml"
          foreach (var errorDetail in Model.ErrorDetails)
         {
 
 #line default
 #line hidden
-
             WriteLiteral("            <div class=\"titleerror\">");
 #line 231 "ErrorPage.cshtml"
                                Write(errorDetail.Error.GetType().Name);
@@ -325,92 +296,75 @@ a {
 
 #line default
 #line hidden
-
             WriteLiteral("</div>\r\n");
 #line 232 "ErrorPage.cshtml"
             
-
-#line default
-#line hidden
-
-#line 232 "ErrorPage.cshtml"
-              
-                var firstFrame = errorDetail.StackFrames.FirstOrDefault();
-                if (firstFrame != null)
-                {
-                    location = firstFrame.Function;
-                }
-            
-
-#line default
-#line hidden
-
-#line 238 "ErrorPage.cshtml"
-             
+            var firstFrame = errorDetail.StackFrames.FirstOrDefault();
+            if (firstFrame != null)
+            {
+                location = firstFrame.Function;
+            }
             if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <p class=\"location\">");
-#line 241 "ErrorPage.cshtml"
+#line 240 "ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 4987, "\"", 5011, 1);
-#line 241 "ErrorPage.cshtml"
-WriteAttributeValue("", 4995, firstFrame.File, 4995, 16, false);
+            BeginWriteAttribute("title", " title=\"", 4950, "\"", 4974, 1);
+#line 240 "ErrorPage.cshtml"
+WriteAttributeValue("", 4958, firstFrame.File, 4958, 16, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">");
-#line 241 "ErrorPage.cshtml"
+#line 240 "ErrorPage.cshtml"
                                                                            Write(System.IO.Path.GetFileName(firstFrame.File));
 
 #line default
 #line hidden
             WriteLiteral("</code>, line ");
-#line 241 "ErrorPage.cshtml"
+#line 240 "ErrorPage.cshtml"
                                                                                                                                      Write(firstFrame.Line);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 242 "ErrorPage.cshtml"
+#line 241 "ErrorPage.cshtml"
             }
             else if (!string.IsNullOrEmpty(location))
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <p class=\"location\">");
-#line 245 "ErrorPage.cshtml"
+#line 244 "ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 246 "ErrorPage.cshtml"
+#line 245 "ErrorPage.cshtml"
             }
             else
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <p class=\"location\">");
-#line 249 "ErrorPage.cshtml"
+#line 248 "ErrorPage.cshtml"
                                Write(Resources.ErrorPageHtml_UnknownLocation);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 250 "ErrorPage.cshtml"
+#line 249 "ErrorPage.cshtml"
             }
 
             var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException;
@@ -421,75 +375,59 @@ WriteAttributeValue("", 4995, firstFrame.File, 4995, 16, false);
 
 #line default
 #line hidden
-
             WriteLiteral("                    <h3>Loader Exceptions:</h3>\r\n                    <ul>\r\n");
-#line 259 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 259 "ErrorPage.cshtml"
+#line 258 "ErrorPage.cshtml"
                          foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                            <li>");
-#line 261 "ErrorPage.cshtml"
+#line 260 "ErrorPage.cshtml"
                            Write(ex.Message);
 
 #line default
 #line hidden
             WriteLiteral("</li>\r\n");
-#line 262 "ErrorPage.cshtml"
+#line 261 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                    </ul>\r\n");
-#line 264 "ErrorPage.cshtml"
+#line 263 "ErrorPage.cshtml"
                 }
             }
         }
 
 #line default
 #line hidden
-
             WriteLiteral("        <ul id=\"header\">\r\n            <li id=\"stack\" tabindex=\"1\" class=\"selected\">\r\n                ");
-#line 269 "ErrorPage.cshtml"
+#line 268 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_StackButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n            <li id=\"query\" tabindex=\"2\">\r\n                ");
-#line 272 "ErrorPage.cshtml"
+#line 271 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_QueryButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n            <li id=\"cookies\" tabindex=\"3\">\r\n                ");
-#line 275 "ErrorPage.cshtml"
+#line 274 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_CookiesButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n            <li id=\"headers\" tabindex=\"4\">\r\n                ");
-#line 278 "ErrorPage.cshtml"
+#line 277 "ErrorPage.cshtml"
            Write(Resources.ErrorPageHtml_HeadersButton);
 
 #line default
 #line hidden
             WriteLiteral("\r\n            </li>\r\n        </ul>\r\n\r\n        <div id=\"stackpage\" class=\"page\">\r\n            <ul>\r\n");
-#line 284 "ErrorPage.cshtml"
-                
-
-#line default
-#line hidden
-
-#line 284 "ErrorPage.cshtml"
+#line 283 "ErrorPage.cshtml"
                   
                     var exceptionCount = 0;
                     var stackFrameCount = 0;
@@ -499,318 +437,225 @@ WriteAttributeValue("", 4995, firstFrame.File, 4995, 16, false);
 
 #line default
 #line hidden
-
             WriteLiteral("                ");
-#line 290 "ErrorPage.cshtml"
+#line 289 "ErrorPage.cshtml"
                  foreach (var errorDetail in Model.ErrorDetails)
                 {
-                    
+                    exceptionCount++;
+                    exceptionDetailId = "exceptionDetail" + exceptionCount;
+
 
 #line default
 #line hidden
-
-#line 292 "ErrorPage.cshtml"
-                      
-                        exceptionCount++;
-                        exceptionDetailId = "exceptionDetail" + exceptionCount;
-                    
-
-#line default
-#line hidden
-
-#line 295 "ErrorPage.cshtml"
-                     
-
-#line default
-#line hidden
-
             WriteLiteral("                    <li>\r\n                        <h2 class=\"stackerror\">");
-#line 297 "ErrorPage.cshtml"
+#line 295 "ErrorPage.cshtml"
                                           Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
             WriteLiteral(": ");
-#line 297 "ErrorPage.cshtml"
+#line 295 "ErrorPage.cshtml"
                                                                              Write(errorDetail.Error.Message);
 
 #line default
 #line hidden
             WriteLiteral("</h2>\r\n                        <ul>\r\n");
-#line 299 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 299 "ErrorPage.cshtml"
+#line 297 "ErrorPage.cshtml"
                          foreach (var frame in errorDetail.StackFrames)
                         {
-                            
+                            stackFrameCount++;
+                            frameId = "frame" + stackFrameCount;
+
 
 #line default
 #line hidden
-
-#line 301 "ErrorPage.cshtml"
-                              
-                                stackFrameCount++;
-                                frameId = "frame" + stackFrameCount;
-                            
-
-#line default
-#line hidden
-
-#line 304 "ErrorPage.cshtml"
-                             
-
-#line default
-#line hidden
-
             WriteLiteral("                            <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 7545, "\"", 7558, 1);
-#line 305 "ErrorPage.cshtml"
-WriteAttributeValue("", 7550, frameId, 7550, 8, false);
+            BeginWriteAttribute("id", " id=\"", 7386, "\"", 7399, 1);
+#line 302 "ErrorPage.cshtml"
+WriteAttributeValue("", 7391, frameId, 7391, 8, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">\r\n");
-#line 306 "ErrorPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 306 "ErrorPage.cshtml"
+#line 303 "ErrorPage.cshtml"
                                  if (string.IsNullOrEmpty(frame.File))
                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                    <h3>");
-#line 308 "ErrorPage.cshtml"
+#line 305 "ErrorPage.cshtml"
                                    Write(frame.Function);
 
 #line default
 #line hidden
             WriteLiteral("</h3>\r\n");
-#line 309 "ErrorPage.cshtml"
+#line 306 "ErrorPage.cshtml"
                                 }
                                 else
                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                    <h3>");
-#line 312 "ErrorPage.cshtml"
+#line 309 "ErrorPage.cshtml"
                                    Write(frame.Function);
 
 #line default
 #line hidden
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 7903, "\"", 7922, 1);
-#line 312 "ErrorPage.cshtml"
-WriteAttributeValue("", 7911, frame.File, 7911, 11, false);
+            BeginWriteAttribute("title", " title=\"", 7744, "\"", 7763, 1);
+#line 309 "ErrorPage.cshtml"
+WriteAttributeValue("", 7752, frame.File, 7752, 11, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(">");
-#line 312 "ErrorPage.cshtml"
+#line 309 "ErrorPage.cshtml"
                                                                                 Write(System.IO.Path.GetFileName(frame.File));
 
 #line default
 #line hidden
             WriteLiteral("</code></h3>\r\n");
-#line 313 "ErrorPage.cshtml"
+#line 310 "ErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("\r\n");
-#line 315 "ErrorPage.cshtml"
-                                
-
-#line default
-#line hidden
-
-#line 315 "ErrorPage.cshtml"
+#line 312 "ErrorPage.cshtml"
                                  if (frame.Line != 0 && frame.ContextCode.Any())
                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                    <button class=\"expandCollapseButton\" data-frameId=\"");
-#line 317 "ErrorPage.cshtml"
+#line 314 "ErrorPage.cshtml"
                                                                                   Write(frameId);
 
 #line default
 #line hidden
             WriteLiteral("\">+</button>\r\n                                    <div class=\"source\">\r\n");
-#line 319 "ErrorPage.cshtml"
-                                        
-
-#line default
-#line hidden
-
-#line 319 "ErrorPage.cshtml"
+#line 316 "ErrorPage.cshtml"
                                          if (frame.PreContextCode.Any())
                                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\"", 8462, "\"", 8491, 1);
-#line 321 "ErrorPage.cshtml"
-WriteAttributeValue("", 8470, frame.PreContextLine, 8470, 21, false);
+            BeginWriteAttribute("start", " start=\"", 8303, "\"", 8332, 1);
+#line 318 "ErrorPage.cshtml"
+WriteAttributeValue("", 8311, frame.PreContextLine, 8311, 21, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 322 "ErrorPage.cshtml"
-                                                
-
-#line default
-#line hidden
-
-#line 322 "ErrorPage.cshtml"
+#line 319 "ErrorPage.cshtml"
                                                  foreach (var line in frame.PreContextCode)
                                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                                    <li><span>");
-#line 324 "ErrorPage.cshtml"
+#line 321 "ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 325 "ErrorPage.cshtml"
+#line 322 "ErrorPage.cshtml"
                                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                                            </ol>\r\n");
-#line 327 "ErrorPage.cshtml"
+#line 324 "ErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
-
             WriteLiteral("\r\n                                        <ol");
-            BeginWriteAttribute("start", " start=\"", 8930, "\"", 8949, 1);
-#line 329 "ErrorPage.cshtml"
-WriteAttributeValue("", 8938, frame.Line, 8938, 11, false);
+            BeginWriteAttribute("start", " start=\"", 8771, "\"", 8790, 1);
+#line 326 "ErrorPage.cshtml"
+WriteAttributeValue("", 8779, frame.Line, 8779, 11, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"highlight\">\r\n");
-#line 330 "ErrorPage.cshtml"
-                                            
-
-#line default
-#line hidden
-
-#line 330 "ErrorPage.cshtml"
+#line 327 "ErrorPage.cshtml"
                                              foreach (var line in frame.ContextCode)
                                             {
 
 #line default
 #line hidden
-
             WriteLiteral("                                                <li><span>");
-#line 332 "ErrorPage.cshtml"
+#line 329 "ErrorPage.cshtml"
                                                      Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 333 "ErrorPage.cshtml"
+#line 330 "ErrorPage.cshtml"
                                             }
 
 #line default
 #line hidden
-
             WriteLiteral("                                        </ol>\r\n\r\n");
-#line 336 "ErrorPage.cshtml"
-                                        
-
-#line default
-#line hidden
-
-#line 336 "ErrorPage.cshtml"
+#line 333 "ErrorPage.cshtml"
                                          if (frame.PostContextCode.Any())
                                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\'", 9442, "\'", 9467, 1);
-#line 338 "ErrorPage.cshtml"
-WriteAttributeValue("", 9450, frame.Line + 1, 9450, 17, false);
+            BeginWriteAttribute("start", " start=\'", 9283, "\'", 9308, 1);
+#line 335 "ErrorPage.cshtml"
+WriteAttributeValue("", 9291, frame.Line + 1, 9291, 17, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 339 "ErrorPage.cshtml"
-                                                
-
-#line default
-#line hidden
-
-#line 339 "ErrorPage.cshtml"
+#line 336 "ErrorPage.cshtml"
                                                  foreach (var line in frame.PostContextCode)
                                                 {
 
 #line default
 #line hidden
-
             WriteLiteral("                                                    <li><span>");
-#line 341 "ErrorPage.cshtml"
+#line 338 "ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
 #line hidden
             WriteLiteral("</span></li>\r\n");
-#line 342 "ErrorPage.cshtml"
+#line 339 "ErrorPage.cshtml"
                                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                                            </ol>\r\n");
-#line 344 "ErrorPage.cshtml"
+#line 341 "ErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                                    </div>\r\n");
-#line 346 "ErrorPage.cshtml"
+#line 343 "ErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
-
             WriteLiteral("                            </li>\r\n");
-#line 348 "ErrorPage.cshtml"
+#line 345 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
             WriteLiteral(@"                        </ul>
                     </li>
                     <li>
@@ -818,66 +663,52 @@ WriteAttributeValue("", 9450, frame.Line + 1, 9450, 17, false);
                         <div class=""rawExceptionBlock"">
                             <div class=""showRawExceptionContainer"">
                                 <button class=""showRawException"" data-exceptionDetailId=""");
-#line 355 "ErrorPage.cshtml"
+#line 352 "ErrorPage.cshtml"
                                                                                     Write(exceptionDetailId);
 
 #line default
 #line hidden
             WriteLiteral("\">Show raw exception details</button>\r\n                            </div>\r\n                            <div");
-            BeginWriteAttribute("id", " id=\"", 10458, "\"", 10481, 1);
-#line 357 "ErrorPage.cshtml"
-WriteAttributeValue("", 10463, exceptionDetailId, 10463, 18, false);
+            BeginWriteAttribute("id", " id=\"", 10299, "\"", 10322, 1);
+#line 354 "ErrorPage.cshtml"
+WriteAttributeValue("", 10304, exceptionDetailId, 10304, 18, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
             WriteLiteral(" class=\"rawExceptionDetails\">\r\n                                <pre class=\"rawExceptionStackTrace\">");
-#line 358 "ErrorPage.cshtml"
+#line 355 "ErrorPage.cshtml"
                                                                Write(errorDetail.Error.ToString());
 
 #line default
 #line hidden
             WriteLiteral("</pre>\r\n                            </div>\r\n                        </div>\r\n                    </li>\r\n");
-#line 362 "ErrorPage.cshtml"
+#line 359 "ErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
-
             WriteLiteral("            </ul>\r\n        </div>\r\n\r\n        <div id=\"querypage\" class=\"page\">\r\n");
-#line 367 "ErrorPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 367 "ErrorPage.cshtml"
+#line 364 "ErrorPage.cshtml"
              if (Model.Query.Any())
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 372 "ErrorPage.cshtml"
+#line 369 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 373 "ErrorPage.cshtml"
+#line 370 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 377 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 377 "ErrorPage.cshtml"
+#line 374 "ErrorPage.cshtml"
                          foreach (var kv in Model.Query.OrderBy(kv => kv.Key))
                         {
                             foreach (var v in kv.Value)
@@ -885,164 +716,130 @@ WriteAttributeValue("", 10463, exceptionDetailId, 10463, 18, false);
 
 #line default
 #line hidden
-
             WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 382 "ErrorPage.cshtml"
+#line 379 "ErrorPage.cshtml"
                                    Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    <td>");
-#line 383 "ErrorPage.cshtml"
+#line 380 "ErrorPage.cshtml"
                                    Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 385 "ErrorPage.cshtml"
+#line 382 "ErrorPage.cshtml"
                             }
                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 389 "ErrorPage.cshtml"
+#line 386 "ErrorPage.cshtml"
             }
             else
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <p>");
-#line 392 "ErrorPage.cshtml"
+#line 389 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoQueryStringData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 393 "ErrorPage.cshtml"
+#line 390 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
-
             WriteLiteral("        </div>\r\n\r\n        <div id=\"cookiespage\" class=\"page\">\r\n");
-#line 397 "ErrorPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 397 "ErrorPage.cshtml"
+#line 394 "ErrorPage.cshtml"
              if (Model.Cookies.Any())
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 402 "ErrorPage.cshtml"
+#line 399 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 403 "ErrorPage.cshtml"
+#line 400 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 407 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 407 "ErrorPage.cshtml"
+#line 404 "ErrorPage.cshtml"
                          foreach (var kv in Model.Cookies.OrderBy(kv => kv.Key))
                         {
 
 #line default
 #line hidden
-
             WriteLiteral("                            <tr>\r\n                                <td>");
-#line 410 "ErrorPage.cshtml"
+#line 407 "ErrorPage.cshtml"
                                Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                <td>");
-#line 411 "ErrorPage.cshtml"
+#line 408 "ErrorPage.cshtml"
                                Write(kv.Value);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                            </tr>\r\n");
-#line 413 "ErrorPage.cshtml"
+#line 410 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 416 "ErrorPage.cshtml"
+#line 413 "ErrorPage.cshtml"
             }
             else
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <p>");
-#line 419 "ErrorPage.cshtml"
+#line 416 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoCookieData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 420 "ErrorPage.cshtml"
+#line 417 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
-
             WriteLiteral("        </div>\r\n        <div id=\"headerspage\" class=\"page\">\r\n");
-#line 423 "ErrorPage.cshtml"
-            
-
-#line default
-#line hidden
-
-#line 423 "ErrorPage.cshtml"
+#line 420 "ErrorPage.cshtml"
              if (Model.Headers.Any())
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <table>\r\n                    <thead>\r\n                        <tr>\r\n                            <th>");
-#line 428 "ErrorPage.cshtml"
+#line 425 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                            <th>");
-#line 429 "ErrorPage.cshtml"
+#line 426 "ErrorPage.cshtml"
                            Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
             WriteLiteral("</th>\r\n                        </tr>\r\n                    </thead>\r\n                    <tbody>\r\n");
-#line 433 "ErrorPage.cshtml"
-                        
-
-#line default
-#line hidden
-
-#line 433 "ErrorPage.cshtml"
+#line 430 "ErrorPage.cshtml"
                          foreach (var kv in Model.Headers.OrderBy(kv => kv.Key))
                         {
                             foreach (var v in kv.Value)
@@ -1050,49 +847,45 @@ WriteAttributeValue("", 10463, exceptionDetailId, 10463, 18, false);
 
 #line default
 #line hidden
-
             WriteLiteral("                                <tr>\r\n                                    <td>");
-#line 438 "ErrorPage.cshtml"
+#line 435 "ErrorPage.cshtml"
                                    Write(kv.Key);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                    <td>");
-#line 439 "ErrorPage.cshtml"
+#line 436 "ErrorPage.cshtml"
                                    Write(v);
 
 #line default
 #line hidden
             WriteLiteral("</td>\r\n                                </tr>\r\n");
-#line 441 "ErrorPage.cshtml"
+#line 438 "ErrorPage.cshtml"
                             }
                         }
 
 #line default
 #line hidden
-
             WriteLiteral("                    </tbody>\r\n                </table>\r\n");
-#line 445 "ErrorPage.cshtml"
+#line 442 "ErrorPage.cshtml"
             }
             else
             {
 
 #line default
 #line hidden
-
             WriteLiteral("                <p>");
-#line 448 "ErrorPage.cshtml"
+#line 445 "ErrorPage.cshtml"
               Write(Resources.ErrorPageHtml_NoHeaderData);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n");
-#line 449 "ErrorPage.cshtml"
+#line 446 "ErrorPage.cshtml"
             }
 
 #line default
 #line hidden
-
             WriteLiteral(@"        </div>
         <script>
             //<!--
@@ -1300,5 +1093,17 @@ WriteAttributeValue("", 10463, exceptionDetailId, 10463, 18, false);
 ");
         }
         #pragma warning restore 1998
+#line 9 "ErrorPage.cshtml"
+ 
+    public ErrorPage(ErrorPageModel model)
+    {
+        Model = model;
+    }
+
+    public ErrorPageModel Model { get; set; }
+
+#line default
+#line hidden
     }
 }
+#pragma warning restore 1591
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
index 05466d8093..3d0a28e8ef 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
@@ -33,12 +33,11 @@
         @foreach (var errorDetail in Model.ErrorDetails)
         {
             <div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }</div>
-            @{
-                var firstFrame = errorDetail.StackFrames.FirstOrDefault();
-                if (firstFrame != null)
-                {
-                    location = firstFrame.Function;
-                }
+            
+            var firstFrame = errorDetail.StackFrames.FirstOrDefault();
+            if (firstFrame != null)
+            {
+                location = firstFrame.Function;
             }
             if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
             {
@@ -93,19 +92,17 @@
                 }
                 @foreach (var errorDetail in Model.ErrorDetails)
                 {
-                    @{
-                        exceptionCount++;
-                        exceptionDetailId = "exceptionDetail" + exceptionCount;
-                    }
+                    exceptionCount++;
+                    exceptionDetailId = "exceptionDetail" + exceptionCount;
+
                     <li>
                         <h2 class="stackerror">@errorDetail.Error.GetType().Name: @errorDetail.Error.Message</h2>
                         <ul>
                         @foreach (var frame in errorDetail.StackFrames)
                         {
-                            @{
-                                stackFrameCount++;
-                                frameId = "frame" + stackFrameCount;
-                            }
+                            stackFrameCount++;
+                            frameId = "frame" + stackFrameCount;
+
                             <li class="frame" id="@frameId">
                                 @if (string.IsNullOrEmpty(frame.File))
                                 {
diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs
index 5d322fb788..bfba4d72c3 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.Designer.cs
@@ -1,28 +1,23 @@
+// <auto-generated/>
+#pragma warning disable 1591
 namespace Microsoft.AspNetCore.Diagnostics.RazorViews
 {
+    #line hidden
 #line 1 "WelcomePage.cshtml"
-using System
+using System;
 
 #line default
 #line hidden
-    ;
-#line 2 "WelcomePage.cshtml"
-using Microsoft.AspNetCore.Diagnostics
-
-#line default
-#line hidden
-    ;
     using System.Threading.Tasks;
+#line 2 "WelcomePage.cshtml"
+using Microsoft.AspNetCore.Diagnostics;
 
+#line default
+#line hidden
     internal class WelcomePage : Microsoft.Extensions.RazorViews.BaseView
     {
-        #line hidden
-        public WelcomePage()
-        {
-        }
-
         #pragma warning disable 1998
-        public override async Task ExecuteAsync()
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
 #line 3 "WelcomePage.cshtml"
   
@@ -30,7 +25,6 @@ using Microsoft.AspNetCore.Diagnostics
 
 #line default
 #line hidden
-
             WriteLiteral("<!DOCTYPE html>\r\n<html");
             BeginWriteAttribute("lang", " lang=\"", 141, "\"", 223, 1);
 #line 7 "WelcomePage.cshtml"
@@ -45,9 +39,8 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
 
 #line default
 #line hidden
-            WriteLiteral(@"</title>
-    <style type=""text/css"">
-        @font-face {
+            WriteLiteral("</title>\r\n    <style type=\"text/css\">\r\n        ");
+            WriteLiteral(@"@font-face {
             font-family: 'SegoeLight', helvetica, sans-serif;
             font-weight: normal;
             font-style: normal;
@@ -85,9 +78,9 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
             }
 
                 .content .bodyContent a {
-                   ");
-            WriteLiteral(@" color: #fff;
-                    text-decoration: none;
+                    color: #fff;
+                    text-decorat");
+            WriteLiteral(@"ion: none;
                 }
 
                     .content .bodyContent a:hover {
@@ -121,9 +114,9 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
                 }
 
                     .content .bodyCTA div img {
-            ");
-            WriteLiteral(@"            position: absolute;
-                        top: 0;
+                        position: absolute;
+              ");
+            WriteLiteral(@"          top: 0;
                         left: 0;
                         border: 0;
                     }
@@ -163,10 +156,10 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
             .browser div {
                 width: 384px;
                 height: 305px;
-                position: absol");
-            WriteLiteral(@"ute;
+                position: absolute;
                 top: 40px;
-                left: 100px;
+             ");
+            WriteLiteral(@"   left: 100px;
                 font-size: 200px;
                 text-align: left;
                 -webkit-touch-callout: none;
@@ -206,11 +199,11 @@ WriteAttributeValue("", 148, System.Globalization.CultureInfo.CurrentUICulture.T
     <div class=""wrapper"">
         <div class=""innerwrapper"">
             <div class=""light first"">
-       ");
-            WriteLiteral(@"         <img src=""data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARIAAAESCAYAAAAxN1ojAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACKhJREFUeNrs3TFPG0kYgOE1kou4IIVTUITiXJAiFFxBk/8vGopQQBEKKFyci7jAhRsX3E4YB3I5Asva3p2Z55EspJNOOq/3Xn8zu7arCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADI1MAhILi/v9+v/wwb/murwWCwcPQQknJCMa7/jOLj3X/+bsKqfiye/F3Gx6KOzcorICSkGY0P9WM/hmK/4/+kZYxLeHwXFyGh3+EYx0cK1lGZh4ewCAm7D0fYyziIjxCOYQZPaxajMqujsvQqCwnbj8dB5k83TCtTURESNheQdTgOCz0EsxiUqbNBSGg+fUzqx8dqc1dVUreKU8qtKUVI+HNAQjSOCp4+mkwpN3VQ5g6FkPAYkHGMh4A0E0LyTVCEpPSAhPs7jqt0LtkKCkJiCVNEUC7dti8kuQdkvYl65GhsVdiUvXKTm5DkGJFwCfdz5SrMroSIXNcxuXEohCSXZcxJZR+kK2GZ89VyR0hSjsh6GTN0NDp3EycUyx0hMYVgOhGSMiJyECNiCumvMJl8cxiEpI8BCeEIm6ku6aYhXCo+t9QRkr4tZU6r7r9AiGZCRM4sdYSkDxEZx4hYyqTrwqeLhaTLiIRlzIkjkYVpHZMLh0FIdh2REBD7IXmZxenEvomQbD0gNlXzFvZLzsRESLYdkS+VTdUSYnLuC5SERERoyxUdIRERxERIRAQxERIRQUzKsucQiAgvCufC3/GcQEga+SwiPBHOhS9iIiRNphE3m/FcTE4dBiF5TUT8LAR/Mo5vNAjJsxEJH8BzkvCSw/iGg5D8FpGRsZUGTuIbD0LyMyLDylcB0NypzVchecoVGt5iaIoVkvU");
-            WriteLiteral(@"0Er5j1XqXtwqbr5+EpOyIrL/tHdo4Kn2/pPSJxLe9s7FzqeT9kmJDEn+8yq47m7L+YXghKWxJ44e82bRJqUucUicSSxoscYSk1TRyYEnDlpc4EyHJOyLrL26GbTqKy2chyXUNG98xYBfLZyHJcBqxwcoujUvaeC1pIhERdu1YSPKaRsLnaNwGz67tl/J1A6VMJMfOaUzCQtJmGgnrVJd76cqohKmkhInEkgZTiZC0mkZGQoKpREi8E2AyFpJOp5GhaYQeyfq+kpwnkolzF1OJkLT10XlL30KS6yeDswxJ/ISvz9RgKhGSVg6cr/TUX0KSxjRik5U+G8WPbAiJaQQsb4QEnKNC8sKyRkiwvBESpcfyRkiEBIo7V3MLia8LIKXlTTb3OmUTkvg5Br9Vg6lESFr54LzEBC0kXhSEREi8KNDQMJfLwFmEpNQfbsaSXEi8GBCYSLwY0Np7IREScO5mFBJfYkSyctjj2/MigDdCE4lpBOewkHgRIP19khxC8s55SOKS/4yYiQS6Z7PVRAKYSKAHUv/MzZ6XEHoh6X2SpEOS4++DgJCoOBS5RLe0ASEREkBIACEBEBJASAAhAYQEQEgAIQGEBHi0EhIHH9q6E5KODAaDhfMPhASwtPECgOk6j5BY3oCQmEgoXvJvhiYS8GYoJLWl85DEzYVESMBEYmkDnbtL/QkkH5LBYLAyleDNUEi8EJRsGd8MhURIoOxzN5eQfHc+kqh5Dk/CRALdusvhSWQRkrjGFBNSPHdNJJY3YFmTW0jmzksSMxMSIQFTdG4hifskYkIqljl9w19u35A2c35ighYSIaEUWZ2rWYWkHhXDZ25cBqbvVvW5KiQ9N3WeYhoREi8SQiIkvVjeuHpDXy1zW9bkOpFY3mAaEZKNTCUhJL5dnj66FRJTCbQxj0tvIVF+eLObXJ9YtiGJ5XcFh77IcpO1hIkk63cAknOd85PLOiTxS2NcCqZrq3gBQEgS9s15TMey36/LPiSmErqeRkpYYu8V8mKaSuhsGsn");
-            WriteLiteral(@"hd2uExFRCd8KVmiLexPYKelFNJezadSlPtJiQxKnE3a7syiL3KzWlTiTrdwifwWEXLkt6skWFJN7t6tZ5tm2ayw9fCcnzMQl7Jb6OkW0JE+9VaU96r9AX+9L5zpZclXC5V0iqnxuvPofDps1L2mA1kTwIG69L5z4bXNJclPrkiw1JHD/Pnf9syEWuX1okJC/HZFEVdNMQWzPL+btGhOR1MQlXcdw+z1stS17SCMmvzis3qtHcj+VxiVdphOT/p5JwIpw5EjR0FZfHxROSx5gsjKg0MC31Uq+QvByTcGI4OXhJuF/Em46Q/DEm4QSx+cpzwuTqtgEheZXzyudx+J3NVSFpNJWsN1/FhKcROSv5pjMheXtMvlYuC/MYEW8sQvKmmCziZCImZRMRIRETWrkQkVf8f+IQvM79/f1+/edL/Rg6GsUsZ85L+6YzIdldTE7rx8jRyD4iljNCstWYDONksu9oiAhC0jYmYTIZOxpZWcTljEu8QrLToJzUfw4diSzMKzebCUmHMZnUfz47Ekmb+uyMkPQhJuO41HFFJy0/fjrCp3iFpE8xsQmblmVcythUFZJeBuVT/efIkei18P2qF/ZDhCSFpU7YiHW/iaWMkNB6qRMmk4mj0QvzqvCfjBAS0wmmECERkx/TyaSyd7Jr06rQ3+IVkryDMorTiTtitytcibn0gTshKWG5c1y5VLxpYf/j2jJGSEoLymFc7tg/aScsXW7jryYiJILiaDQPSP24sQ8iJPwalPCwh/KKJUz18OPdAiIkPBOUcQyKTxb/ah6nj5lDISS8PijDGJO/Cl72hOkjhOPWzWRCQvuo7MeoHBQQlVWMx8z0ISSIingICYlEZRSDMo6PlL4TZR4f//g4v5DQv2nlQ/Vws9v7qj83vYX9jUUMx527ToWE9OIyjkugUfV4aXlbl5gXcZkyj3/vwj9zmVZIyH+CWS+H3jdYGq0j8XAimTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
-            WriteLiteral("AAAAAAAAAAAAAAHL0rwADANq3ok68n5URAAAAAElFTkSuQmCC\"");
+                <img src=""data:image/png;base64,iVBORw");
+            WriteLiteral(@"0KGgoAAAANSUhEUgAAARIAAAESCAYAAAAxN1ojAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACKhJREFUeNrs3TFPG0kYgOE1kou4IIVTUITiXJAiFFxBk/8vGopQQBEKKFyci7jAhRsX3E4YB3I5Asva3p2Z55EspJNOOq/3Xn8zu7arCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADI1MAhILi/v9+v/wwb/murwWCwcPQQknJCMa7/jOLj3X/+bsKqfiye/F3Gx6KOzcorICSkGY0P9WM/hmK/4/+kZYxLeHwXFyGh3+EYx0cK1lGZh4ewCAm7D0fYyziIjxCOYQZPaxajMqujsvQqCwnbj8dB5k83TCtTURESNheQdTgOCz0EsxiUqbNBSGg+fUzqx8dqc1dVUreKU8qtKUVI+HNAQjSOCp4+mkwpN3VQ5g6FkPAYkHGMh4A0E0LyTVCEpPSAhPs7jqt0LtkKCkJiCVNEUC7dti8kuQdkvYl65GhsVdiUvXKTm5DkGJFwCfdz5SrMroSIXNcxuXEohCSXZcxJZR+kK2GZ89VyR0hSjsh6GTN0NDp3EycUyx0hMYVgOhGSMiJyECNiCumvMJl8cxiEpI8BCeEIm6ku6aYhXCo+t9QRkr4tZU6r7r9AiGZCRM4sdYSkDxEZx4hYyqTrwqeLhaTLiIRlzIkjkYVpHZMLh0FIdh2REBD7IXmZxenEvomQbD0gNlXzFvZLzsRESLYdkS+VTdUSYnLuC5SERERoyxUdIRERxERIRAQxERIRQUzKsucQiAgvCufC3/GcQEga+SwiPBHOhS9iIiRNphE3m/FcTE4dBiF5TUT8LAR/Mo5vNAjJsxEJH8BzkvCSw/iGg5D8FpGRsZUGTuIbD0LyMyLDylcB0NypzVchecoVGt5iaIoVkvU0Er5j1XqXtwqbr5+EpOyIrL/tHdo4Kn2/pPSJxLe9s7Fzqe");
+            WriteLiteral(@"T9kmJDEn+8yq47m7L+YXghKWxJ44e82bRJqUucUicSSxoscYSk1TRyYEnDlpc4EyHJOyLrL26GbTqKy2chyXUNG98xYBfLZyHJcBqxwcoujUvaeC1pIhERdu1YSPKaRsLnaNwGz67tl/J1A6VMJMfOaUzCQtJmGgnrVJd76cqohKmkhInEkgZTiZC0mkZGQoKpREi8E2AyFpJOp5GhaYQeyfq+kpwnkolzF1OJkLT10XlL30KS6yeDswxJ/ISvz9RgKhGSVg6cr/TUX0KSxjRik5U+G8WPbAiJaQQsb4QEnKNC8sKyRkiwvBESpcfyRkiEBIo7V3MLia8LIKXlTTb3OmUTkvg5Br9Vg6lESFr54LzEBC0kXhSEREi8KNDQMJfLwFmEpNQfbsaSXEi8GBCYSLwY0Np7IREScO5mFBJfYkSyctjj2/MigDdCE4lpBOewkHgRIP19khxC8s55SOKS/4yYiQS6Z7PVRAKYSKAHUv/MzZ6XEHoh6X2SpEOS4++DgJCoOBS5RLe0ASEREkBIACEBEBJASAAhAYQEQEgAIQGEBHi0EhIHH9q6E5KODAaDhfMPhASwtPECgOk6j5BY3oCQmEgoXvJvhiYS8GYoJLWl85DEzYVESMBEYmkDnbtL/QkkH5LBYLAyleDNUEi8EJRsGd8MhURIoOxzN5eQfHc+kqh5Dk/CRALdusvhSWQRkrjGFBNSPHdNJJY3YFmTW0jmzksSMxMSIQFTdG4hifskYkIqljl9w19u35A2c35ighYSIaEUWZ2rWYWkHhXDZ25cBqbvVvW5KiQ9N3WeYhoREi8SQiIkvVjeuHpDXy1zW9bkOpFY3mAaEZKNTCUhJL5dnj66FRJTCbQxj0tvIVF+eLObXJ9YtiGJ5XcFh77IcpO1hIkk63cAknOd85PLOiTxS2NcCqZrq3gBQEgS9s15TMey36/LPiSmErqeRkpYYu8V8mKaSuhsGsnhd2uExFRCd8KVmiLexPYKelFNJezadSlPtJiQxKnE3a7syi");
+            WriteLiteral(@"L3KzWlTiTrdwifwWEXLkt6skWFJN7t6tZ5tm2ayw9fCcnzMQl7Jb6OkW0JE+9VaU96r9AX+9L5zpZclXC5V0iqnxuvPofDps1L2mA1kTwIG69L5z4bXNJclPrkiw1JHD/Pnf9syEWuX1okJC/HZFEVdNMQWzPL+btGhOR1MQlXcdw+z1stS17SCMmvzis3qtHcj+VxiVdphOT/p5JwIpw5EjR0FZfHxROSx5gsjKg0MC31Uq+QvByTcGI4OXhJuF/Em46Q/DEm4QSx+cpzwuTqtgEheZXzyudx+J3NVSFpNJWsN1/FhKcROSv5pjMheXtMvlYuC/MYEW8sQvKmmCziZCImZRMRIRETWrkQkVf8f+IQvM79/f1+/edL/Rg6GsUsZ85L+6YzIdldTE7rx8jRyD4iljNCstWYDONksu9oiAhC0jYmYTIZOxpZWcTljEu8QrLToJzUfw4diSzMKzebCUmHMZnUfz47Ekmb+uyMkPQhJuO41HFFJy0/fjrCp3iFpE8xsQmblmVcythUFZJeBuVT/efIkei18P2qF/ZDhCSFpU7YiHW/iaWMkNB6qRMmk4mj0QvzqvCfjBAS0wmmECERkx/TyaSyd7Jr06rQ3+IVkryDMorTiTtitytcibn0gTshKWG5c1y5VLxpYf/j2jJGSEoLymFc7tg/aScsXW7jryYiJILiaDQPSP24sQ8iJPwalPCwh/KKJUz18OPdAiIkPBOUcQyKTxb/ah6nj5lDISS8PijDGJO/Cl72hOkjhOPWzWRCQvuo7MeoHBQQlVWMx8z0ISSIingICYlEZRSDMo6PlL4TZR4f//g4v5DQv2nlQ/Vws9v7qj83vYX9jUUMx527ToWE9OIyjkugUfV4aXlbl5gXcZkyj3/vwj9zmVZIyH+CWS+H3jdYGq0j8XAimTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHL0rwADANq3ok68n5URAAAAAElFTkSuQm");
+            WriteLiteral("CC\"");
             BeginWriteAttribute("alt", "\r\n                    alt=\"", 7518, "\"", 7586, 1);
 #line 169 "WelcomePage.cshtml"
 WriteAttributeValue("", 7545, Resources.WelcomePageImageText_LightBulb, 7545, 41, false);
@@ -370,3 +363,4 @@ WriteAttributeValue("", 49215, Resources.WelcomePageImageText_LearnMore, 49215,
         #pragma warning restore 1998
     }
 }
+#pragma warning restore 1591