diff --git a/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
index acdb08b710..151b1aa94f 100644
--- a/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
@@ -378,6 +378,22 @@ namespace Microsoft.AspNet.Diagnostics
             return GetString("RuntimeInfoPage_PackagesFail");
         }
 
+        /// <summary>
+        /// Name
+        /// </summary>
+        internal static string RuntimeInfoPage_PackageVersionColumnName
+        {
+            get { return GetString("RuntimeInfoPage_PackageVersionColumnName"); }
+        }
+
+        /// <summary>
+        /// Name
+        /// </summary>
+        internal static string FormatRuntimeInfoPage_PackageVersionColumnName()
+        {
+            return GetString("RuntimeInfoPage_PackageVersionColumnName");
+        }
+
         /// <summary>
         /// Runtime Version:
         /// </summary>
diff --git a/src/Microsoft.AspNet.Diagnostics/Resources.resx b/src/Microsoft.AspNet.Diagnostics/Resources.resx
index 4eb16cc19c..a56b82ed1d 100644
--- a/src/Microsoft.AspNet.Diagnostics/Resources.resx
+++ b/src/Microsoft.AspNet.Diagnostics/Resources.resx
@@ -194,6 +194,9 @@
   <data name="RuntimeInfoPage_PackagesFail" xml:space="preserve">
     <value>Could not retrieve the list of loaded packages.</value>
   </data>
+  <data name="RuntimeInfoPage_PackageVersionColumnName" xml:space="preserve">
+    <value>Version</value>
+  </data>
   <data name="RuntimeInfoPage_RuntimeVersion" xml:space="preserve">
     <value>Runtime Version:</value>
   </data>
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs
index 85c21de952..a96bc09294 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs
@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
 namespace Microsoft.AspNet.Diagnostics.Views
 {
 #line 1 "DiagnosticsPage.cshtml"
@@ -41,64 +38,34 @@ using System.Globalization
 
             WriteLiteral("\r\n<!DOCTYPE html>\r\n\r\n<html lang=\"en\" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n<head" +
 ">\r\n    <meta charset=\"utf-8\" />\r\n    <title>");
-            Write(
 #line 16 "DiagnosticsPage.cshtml"
-            Resources.DiagnosticsPageHtml_Title
+      Write(Resources.DiagnosticsPageHtml_Title);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</title>\r\n</head>\r\n<body>\r\n    <div class=\"main\">\r\n        <h1>");
-            Write(
 #line 20 "DiagnosticsPage.cshtml"
-             Resources.DiagnosticsPageHtml_Title
+       Write(Resources.DiagnosticsPageHtml_Title);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h1>\r\n        <p>");
-            Write(
 #line 21 "DiagnosticsPage.cshtml"
-            Resources.DiagnosticsPageHtml_Information
+      Write(Resources.DiagnosticsPageHtml_Information);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</p>\r\n    </div>\r\n    <div class=\"errors\">\r\n        <h2>");
-            Write(
 #line 24 "DiagnosticsPage.cshtml"
-             Resources.DiagnosticsPageHtml_TestErrorSection
+       Write(Resources.DiagnosticsPageHtml_TestErrorSection);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h2>\r\n        <p><a");
             WriteAttribute("href", Tuple.Create(" href=\"", 767), Tuple.Create("\"", 858), 
-            Tuple.Create(Tuple.Create("", 774), Tuple.Create<System.Object, System.Int32>(
-#line 25 "DiagnosticsPage.cshtml"
-                     Request.PathBase
-
-#line default
-#line hidden
-            , 774), false), 
-            Tuple.Create(Tuple.Create("", 791), Tuple.Create<System.Object, System.Int32>(
-#line 25 "DiagnosticsPage.cshtml"
-                                      Request.Path
-
-#line default
-#line hidden
-            , 791), false), Tuple.Create(Tuple.Create("", 804), Tuple.Create("?error=", 804), true), 
-            Tuple.Create(Tuple.Create("", 811), Tuple.Create<System.Object, System.Int32>(
-#line 25 "DiagnosticsPage.cshtml"
-                                                          Resources.DiagnosticsPageHtml_TestErrorMessage
-
-#line default
-#line hidden
-            , 811), false));
+            Tuple.Create(Tuple.Create("", 774), Tuple.Create<System.Object, System.Int32>(Request.PathBase, 774), false), 
+            Tuple.Create(Tuple.Create("", 791), Tuple.Create<System.Object, System.Int32>(Request.Path, 791), false), Tuple.Create(Tuple.Create("", 804), Tuple.Create("?error=", 804), true), 
+            Tuple.Create(Tuple.Create("", 811), Tuple.Create<System.Object, System.Int32>(Resources.DiagnosticsPageHtml_TestErrorMessage, 811), false));
             WriteLiteral(">throw InvalidOperationException</a></p>\r\n    </div>\r\n</body>\r\n</html>\r\n");
         }
         #pragma warning restore 1998
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
index e07c402da0..3dcfb1eb99 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
@@ -60,33 +60,21 @@ using Views
 
             WriteLiteral("\r\n<!DOCTYPE html>\r\n<html");
             WriteAttribute("lang", Tuple.Create(" lang=\"", 499), Tuple.Create("\"", 560), 
-            Tuple.Create(Tuple.Create("", 506), Tuple.Create<System.Object, System.Int32>(
-#line 22 "ErrorPage.cshtml"
-             CultureInfo.CurrentUICulture.TwoLetterISOLanguageName
-
-#line default
-#line hidden
-            , 506), false));
+            Tuple.Create(Tuple.Create("", 506), Tuple.Create<System.Object, System.Int32>(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 506), false));
             WriteLiteral(" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <head>\r\n        <meta charset=\"utf-8\"" +
 " />\r\n        <title>");
-            Write(
 #line 25 "ErrorPage.cshtml"
-                Resources.ErrorPageHtml_Title
+          Write(Resources.ErrorPageHtml_Title);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</title>\r\n        <style>\r\n            body {\r\n    font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;\r\n    font-size: .813em;\r\n    line-height: 1.4em;\r\n    color: #222;\r\n}\r\n\r\nh1, h2, h3, h4, h5 {\r\n    /*font-family: 'Segoe UI',Tahoma,Arial,Helvetica,sans-serif;*/\r\n    font-weight: 100;\r\n}\r\n\r\nh1 {\r\n    color: #44525e;\r\n    margin: 15px 0 15px 0;\r\n}\r\n\r\nh2 {\r\n    margin: 10px 5px 0 0;\r\n}\r\n\r\nh3 {\r\n    color: #363636;\r\n    margin: 5px 5px 0 0;\r\n}\r\n\r\ncode {\r\n    font-family: Consolas, \"Courier New\", courier, monospace;\r\n}\r\n\r\nbody .titleerror {\r\n    padding: 3px;\r\n}\r\n\r\nbody .location {\r\n    margin: 3px 0 10px 30px;\r\n}\r\n\r\n#header {\r\n    font-size: 18px;\r\n    padding: 15px 0;\r\n    border-top: 1px #ddd solid;\r\n    border-bottom: 1px #ddd solid;\r\n    margin-bottom: 0;\r\n}\r\n\r\n    #header li {\r\n        display: inline;\r\n        margin: 5px;\r\n        padding: 5px;\r\n        color: #a0a0a0;\r\n        cursor: pointer;\r\n    }\r\n\r\n        #header li:hover {\r\n            background: #a9e4f9;\r\n            color: #fff;\r\n        }\r\n\r\n        #header .selected {\r\n            background: #44c5f2;\r\n            color: #fff;\r\n        }\r\n\r\n#stackpage ul {\r\n    list-style: none;\r\n    padding-left: 0;\r\n    margin: 0;\r\n    /*border-bottom: 1px #ddd solid;*/\r\n}\r\n\r\n#stackpage .stackerror {\r\n    padding: 5px;\r\n    border-bottom: 1px #ddd solid;\r\n}\r\n\r\n    #stackpage .stackerror:hover {\r\n        background-color: #f0f0f0;\r\n    }\r\n\r\n#stackpage .frame:hover {\r\n    background-color: #f0f0f0;\r\n    text-decoration: none;\r\n}\r\n\r\n#stackpage .frame {\r\n    padding: 2px;\r\n    margin: 0 0 0 30px;\r\n    border-bottom: 1px #ddd solid;\r\n    cursor: pointer;\r\n}\r\n\r\n    #stackpage .frame h3 {\r\n        padding: 5px;\r\n        margin: 0;\r\n    }\r\n\r\n#stackpage .source {\r\n    padding: 0;\r\n}\r\n\r\n    #stackpage .source ol li {\r\n        font-family: Consolas, \"Courier New\", courier, monospace;\r\n        white-space: pre;\r\n    }\r\n\r\n#stackpage .frame:hover .source .highlight li span {\r\n    color: #fff;\r\n    background: #b20000;\r\n}\r\n\r\n#stackpage .source ol.collapsable li {\r\n    color: #888;\r\n}\r\n\r\n    #stackpage .source ol.collapsable li span {\r\n        color: #606060;\r\n    }\r\n\r\n.page table {\r\n    border-collapse: separate;\r\n    border-spacing: 0;\r\n    margin: 0 0 20px;\r\n}\r\n\r\n.page th {\r\n    vertical-align: bottom;\r\n    padding: 10px 5px 5px 5px;\r\n    font-weight: 400;\r\n    color: #a0a0a0;\r\n    text-align: left;\r\n}\r\n\r\n.page td {\r\n    padding: 3px 10px;\r\n}\r\n\r\n.page th, .page td {\r\n    border-right: 1px #ddd solid;\r\n    border-bottom: 1px #ddd solid;\r\n    border-left: 1px transparent solid;\r\n    border-top: 1px transparent solid;\r\n    box-sizing: border-box;\r\n}\r\n\r\n    .page th:last-child, .page td:last-child {\r\n        border-right: 1px transparent solid;\r\n    }\r\n\r\n    .page .length {\r\n        text-align: right;\r\n    }\r\n\r\na {\r\n    color: #1ba1e2;\r\n    text-decoration: none;\r\n}\r\n\r\n    a:hover {\r\n        color: #13709e;\r\n        text-decoration: underline;\r\n    }\r\n\r\n        </s" +
 "tyle>\r\n    </head>\r\n    <body>\r\n        <h1>");
-            Write(
 #line 31 "ErrorPage.cshtml"
-             Resources.ErrorPageHtml_UnhandledException
+       Write(Resources.ErrorPageHtml_UnhandledException);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h1>\r\n");
 #line 32 "ErrorPage.cshtml"
         
@@ -104,23 +92,17 @@ using Views
 #line hidden
 
             WriteLiteral("                <h2 class=\"titleerror\">");
-            Write(
 #line 36 "ErrorPage.cshtml"
-                                        errorDetail.Error.GetType().Name
+                                  Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral(": ");
-            Write(
 #line 36 "ErrorPage.cshtml"
-                                                                           errorDetail.Error.Message
+                                                                     Write(errorDetail.Error.Message);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h2>\r\n");
 #line 37 "ErrorPage.cshtml"
                 
@@ -154,41 +136,26 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p class=\"location\">");
-            Write(
 #line 51 "ErrorPage.cshtml"
-                                         location
+                                   Write(location);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral(" in <code");
             WriteAttribute("title", Tuple.Create(" title=\"", 1955), Tuple.Create("\"", 1979), 
-            Tuple.Create(Tuple.Create("", 1963), Tuple.Create<System.Object, System.Int32>(
-#line 51 "ErrorPage.cshtml"
-                                                                   firstFrame.File
-
-#line default
-#line hidden
-            , 1963), false));
+            Tuple.Create(Tuple.Create("", 1963), Tuple.Create<System.Object, System.Int32>(firstFrame.File, 1963), false));
             WriteLiteral(">");
-            Write(
 #line 51 "ErrorPage.cshtml"
-                                                                                     System.IO.Path.GetFileName(firstFrame.File)
+                                                                               Write(System.IO.Path.GetFileName(firstFrame.File));
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</code>, line ");
-            Write(
 #line 51 "ErrorPage.cshtml"
-                                                                                                                                               firstFrame.Line
+                                                                                                                                         Write(firstFrame.Line);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</p>\r\n");
 #line 52 "ErrorPage.cshtml"
                 }
@@ -199,14 +166,11 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p class=\"location\">");
-            Write(
 #line 55 "ErrorPage.cshtml"
-                                         location
+                                   Write(location);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</p>\r\n");
 #line 56 "ErrorPage.cshtml"
                 }
@@ -217,14 +181,11 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p class=\"location\">");
-            Write(
 #line 59 "ErrorPage.cshtml"
-                                         Resources.ErrorPageHtml_UnknownLocation
+                                   Write(Resources.ErrorPageHtml_UnknownLocation);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</p>\r\n");
 #line 60 "ErrorPage.cshtml"
                 }
@@ -237,14 +198,11 @@ using Views
 #line hidden
 
             WriteLiteral("            <h2>");
-            Write(
 #line 65 "ErrorPage.cshtml"
-                 Resources.ErrorPageHtml_EnableShowExceptions
+           Write(Resources.ErrorPageHtml_EnableShowExceptions);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h2>\r\n");
 #line 66 "ErrorPage.cshtml"
         }
@@ -268,14 +226,11 @@ using Views
 
             WriteLiteral("                <li id=\"stack\" tabindex=\"1\" class=\"selected\">\r\n                  " +
 "  ");
-            Write(
 #line 71 "ErrorPage.cshtml"
-                     Resources.ErrorPageHtml_StackButton
+               Write(Resources.ErrorPageHtml_StackButton);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("\r\n                </li>\r\n");
 #line 73 "ErrorPage.cshtml"
             }
@@ -292,14 +247,11 @@ using Views
 #line hidden
 
             WriteLiteral("                <li id=\"query\" tabindex=\"2\">\r\n                    ");
-            Write(
 #line 77 "ErrorPage.cshtml"
-                     Resources.ErrorPageHtml_QueryButton
+               Write(Resources.ErrorPageHtml_QueryButton);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("\r\n                </li>\r\n");
 #line 79 "ErrorPage.cshtml"
             }
@@ -316,14 +268,11 @@ using Views
 #line hidden
 
             WriteLiteral("                <li id=\"cookies\" tabindex=\"3\">\r\n                    ");
-            Write(
 #line 83 "ErrorPage.cshtml"
-                     Resources.ErrorPageHtml_CookiesButton
+               Write(Resources.ErrorPageHtml_CookiesButton);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("\r\n                </li>\r\n");
 #line 85 "ErrorPage.cshtml"
             }
@@ -340,14 +289,11 @@ using Views
 #line hidden
 
             WriteLiteral("                <li id=\"headers\" tabindex=\"4\">\r\n                    ");
-            Write(
 #line 89 "ErrorPage.cshtml"
-                     Resources.ErrorPageHtml_HeadersButton
+               Write(Resources.ErrorPageHtml_HeadersButton);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("\r\n                </li>\r\n");
 #line 91 "ErrorPage.cshtml"
             }
@@ -364,14 +310,11 @@ using Views
 #line hidden
 
             WriteLiteral("                <li id=\"environment\" tabindex=\"5\">\r\n                    ");
-            Write(
 #line 95 "ErrorPage.cshtml"
-                     Resources.ErrorPageHtml_EnvironmentButton
+               Write(Resources.ErrorPageHtml_EnvironmentButton);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("\r\n                </li>\r\n");
 #line 97 "ErrorPage.cshtml"
             }
@@ -422,23 +365,17 @@ using Views
 
             WriteLiteral("                        <li>\r\n                            <h2 class=\"stackerror\">" +
 "");
-            Write(
 #line 107 "ErrorPage.cshtml"
-                                                    errorDetail.Error.GetType().Name
+                                              Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral(": ");
-            Write(
 #line 107 "ErrorPage.cshtml"
-                                                                                       errorDetail.Error.Message
+                                                                                 Write(errorDetail.Error.Message);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h2>\r\n                            <ul>\r\n");
 #line 109 "ErrorPage.cshtml"
                             
@@ -455,13 +392,7 @@ using Views
 
             WriteLiteral("                                <li class=\"frame\"");
             WriteAttribute("tabindex", Tuple.Create(" tabindex=\"", 4214), Tuple.Create("\"", 4234), 
-            Tuple.Create(Tuple.Create("", 4225), Tuple.Create<System.Object, System.Int32>(
-#line 111 "ErrorPage.cshtml"
-                                                             tabIndex
-
-#line default
-#line hidden
-            , 4225), false));
+            Tuple.Create(Tuple.Create("", 4225), Tuple.Create<System.Object, System.Int32>(tabIndex, 4225), false));
             WriteLiteral(">\r\n");
 #line 112 "ErrorPage.cshtml"
                                     
@@ -490,14 +421,11 @@ using Views
 #line hidden
 
             WriteLiteral("                                        <h3>");
-            Write(
 #line 115 "ErrorPage.cshtml"
-                                             frame.Function
+                                       Write(frame.Function);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h3>\r\n");
 #line 116 "ErrorPage.cshtml"
                                     }
@@ -508,32 +436,20 @@ using Views
 #line hidden
 
             WriteLiteral("                                        <h3>");
-            Write(
 #line 119 "ErrorPage.cshtml"
-                                             frame.Function
+                                       Write(frame.Function);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral(" in <code");
             WriteAttribute("title", Tuple.Create(" title=\"", 4661), Tuple.Create("\"", 4680), 
-            Tuple.Create(Tuple.Create("", 4669), Tuple.Create<System.Object, System.Int32>(
-#line 119 "ErrorPage.cshtml"
-                                                                             frame.File
-
-#line default
-#line hidden
-            , 4669), false));
+            Tuple.Create(Tuple.Create("", 4669), Tuple.Create<System.Object, System.Int32>(frame.File, 4669), false));
             WriteLiteral(">");
-            Write(
 #line 119 "ErrorPage.cshtml"
-                                                                                          System.IO.Path.GetFileName(frame.File)
+                                                                                    Write(System.IO.Path.GetFileName(frame.File));
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</code></h3>\r\n");
 #line 120 "ErrorPage.cshtml"
                                     }
@@ -571,13 +487,7 @@ using Views
 
             WriteLiteral("                                                <ol");
             WriteAttribute("start", Tuple.Create(" start=\"", 5143), Tuple.Create("\"", 5172), 
-            Tuple.Create(Tuple.Create("", 5151), Tuple.Create<System.Object, System.Int32>(
-#line 127 "ErrorPage.cshtml"
-                                                            frame.PreContextLine
-
-#line default
-#line hidden
-            , 5151), false));
+            Tuple.Create(Tuple.Create("", 5151), Tuple.Create<System.Object, System.Int32>(frame.PreContextLine, 5151), false));
             WriteLiteral(" class=\"collapsible\">\r\n");
 #line 128 "ErrorPage.cshtml"
                                                     
@@ -593,14 +503,11 @@ using Views
 #line hidden
 
             WriteLiteral("                                                        <li><span>");
-            Write(
 #line 130 "ErrorPage.cshtml"
-                                                                   line
+                                                             Write(line);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</span></li>\r\n");
 #line 131 "ErrorPage.cshtml"
                                                     }
@@ -617,22 +524,13 @@ using Views
 
             WriteLiteral("\r\n                                            <ol");
             WriteAttribute("start", Tuple.Create(" start=\"", 5640), Tuple.Create("\"", 5659), 
-            Tuple.Create(Tuple.Create("", 5648), Tuple.Create<System.Object, System.Int32>(
-#line 135 "ErrorPage.cshtml"
-                                                        frame.Line
-
-#line default
-#line hidden
-            , 5648), false));
+            Tuple.Create(Tuple.Create("", 5648), Tuple.Create<System.Object, System.Int32>(frame.Line, 5648), false));
             WriteLiteral(" class=\"highlight\">\r\n                                                <li><span>");
-            Write(
 #line 136 "ErrorPage.cshtml"
-                                                           frame.ContextCode
+                                                     Write(frame.ContextCode);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</span></li></ol>\r\n\r\n");
 #line 138 "ErrorPage.cshtml"
                                             
@@ -649,13 +547,7 @@ using Views
 
             WriteLiteral("                                                <ol");
             WriteAttribute("start", Tuple.Create(" start=\'", 5957), Tuple.Create("\'", 5982), 
-            Tuple.Create(Tuple.Create("", 5965), Tuple.Create<System.Object, System.Int32>(
-#line 140 "ErrorPage.cshtml"
-                                                             frame.Line + 1
-
-#line default
-#line hidden
-            , 5965), false));
+            Tuple.Create(Tuple.Create("", 5965), Tuple.Create<System.Object, System.Int32>(frame.Line + 1, 5965), false));
             WriteLiteral(" class=\"collapsible\">\r\n");
 #line 141 "ErrorPage.cshtml"
                                                     
@@ -671,14 +563,11 @@ using Views
 #line hidden
 
             WriteLiteral("                                                        <li><span>");
-            Write(
 #line 143 "ErrorPage.cshtml"
-                                                                   line
+                                                             Write(line);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</span></li>\r\n");
 #line 144 "ErrorPage.cshtml"
                                                     }
@@ -745,23 +634,17 @@ using Views
 
             WriteLiteral("                    <table>\r\n                        <thead>\r\n                   " +
 "         <tr>\r\n                                <th>");
-            Write(
 #line 165 "ErrorPage.cshtml"
-                                     Resources.ErrorPageHtml_VariableColumn
+                               Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</th>\r\n                                <th>");
-            Write(
 #line 166 "ErrorPage.cshtml"
-                                     Resources.ErrorPageHtml_ValueColumn
+                               Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</th>\r\n                            </tr>\r\n                        </thead>\r\n     " +
 "                   <tbody>\r\n");
 #line 170 "ErrorPage.cshtml"
@@ -781,23 +664,17 @@ using Views
 
             WriteLiteral("                                    <tr>\r\n                                       " +
 " <td>");
-            Write(
 #line 175 "ErrorPage.cshtml"
-                                             kv.Key
+                                       Write(kv.Key);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</td>\r\n                                        <td>");
-            Write(
 #line 176 "ErrorPage.cshtml"
-                                             v
+                                       Write(v);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</td>\r\n                                    </tr>\r\n");
 #line 178 "ErrorPage.cshtml"
                                 }
@@ -816,14 +693,11 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p>");
-            Write(
 #line 185 "ErrorPage.cshtml"
-                        Resources.ErrorPageHtml_NoQueryStringData
+                  Write(Resources.ErrorPageHtml_NoQueryStringData);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</p>\r\n");
 #line 186 "ErrorPage.cshtml"
                 }
@@ -899,23 +773,17 @@ using Views
 
             WriteLiteral("                    <table>\r\n                        <thead>\r\n                   " +
 "         <tr>\r\n                                <th>");
-            Write(
 #line 228 "ErrorPage.cshtml"
-                                     Resources.ErrorPageHtml_VariableColumn
+                               Write(Resources.ErrorPageHtml_VariableColumn);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</th>\r\n                                <th>");
-            Write(
 #line 229 "ErrorPage.cshtml"
-                                     Resources.ErrorPageHtml_ValueColumn
+                               Write(Resources.ErrorPageHtml_ValueColumn);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</th>\r\n                            </tr>\r\n                        </thead>\r\n     " +
 "                   <tbody>\r\n");
 #line 233 "ErrorPage.cshtml"
@@ -935,23 +803,17 @@ using Views
 
             WriteLiteral("                                    <tr>\r\n                                       " +
 " <td>");
-            Write(
 #line 238 "ErrorPage.cshtml"
-                                             kv.Key
+                                       Write(kv.Key);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</td>\r\n                                        <td>");
-            Write(
 #line 239 "ErrorPage.cshtml"
-                                             v
+                                       Write(v);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</td>\r\n                                    </tr>\r\n");
 #line 241 "ErrorPage.cshtml"
                                 }
@@ -970,14 +832,11 @@ using Views
 #line hidden
 
             WriteLiteral("                    <p>");
-            Write(
 #line 248 "ErrorPage.cshtml"
-                        Resources.ErrorPageHtml_NoHeaderData
+                  Write(Resources.ErrorPageHtml_NoHeaderData);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</p>\r\n");
 #line 249 "ErrorPage.cshtml"
                 }
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs
index 9b4b7bf254..b62ed1ccd6 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cs
@@ -61,51 +61,33 @@ using Microsoft.Framework.Runtime;
             WriteLiteral("\r\n");
             WriteLiteral("<!DOCTYPE html>\r\n<html");
             WriteAttribute("lang", Tuple.Create(" lang=\"", 372), Tuple.Create("\"", 433), 
-            Tuple.Create(Tuple.Create("", 379), Tuple.Create<System.Object, System.Int32>(
-#line 18 "RuntimeInfoPage.cshtml"
-             CultureInfo.CurrentUICulture.TwoLetterISOLanguageName
-
-#line default
-#line hidden
-            , 379), false));
+            Tuple.Create(Tuple.Create("", 379), Tuple.Create<System.Object, System.Int32>(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 379), false));
             WriteLiteral(" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n<head>\r\n    <meta charset=\"utf-8\" />\r\n   " +
 " <title>");
-            Write(
 #line 21 "RuntimeInfoPage.cshtml"
-            Resources.RuntimeInfoPage_Title
+      Write(Resources.RuntimeInfoPage_Title);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</title>\r\n    <style>\r\n        body {\r\n    font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;\r\n    font-size: .813em;\r\n    line-height: 1.4em;\r\n    color: #222;\r\n}\r\n\r\nh1, h2, h3, h4, h5, th {\r\n    font-weight: 100;\r\n}\r\n\r\nh1 {\r\n    color: #44525e;\r\n    margin: 15px 0 15px 0;\r\n}\r\n\r\nh2 {\r\n    margin: 10px 5px 0 0;\r\n}\r\n\r\ntable .even{\r\n    background-color: #f0f0f0;\r\n}\r\n\r\nth {\r\n    font-size: 16px;\r\n}\r\n\r\n\r\n\r\n    </style>\r" +
 "\n</head>\r\n<body>\r\n    <h1>");
-            Write(
 #line 27 "RuntimeInfoPage.cshtml"
-         Resources.RuntimeInfoPage_RuntimeVersion
+   Write(Resources.RuntimeInfoPage_RuntimeVersion);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h1>\r\n    <h2>");
-            Write(
 #line 28 "RuntimeInfoPage.cshtml"
-          string.IsNullOrWhiteSpace(Model.Version) ? Resources.RuntimeInfoPage_RuntimeVersionFail : Model.Version
+    Write(string.IsNullOrWhiteSpace(Model.Version) ? Resources.RuntimeInfoPage_RuntimeVersionFail : Model.Version);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h2>\r\n    \r\n    <h1>");
-            Write(
 #line 30 "RuntimeInfoPage.cshtml"
-         Resources.RuntimeInfoPage_Packages
+   Write(Resources.RuntimeInfoPage_Packages);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h1>\r\n");
 #line 31 "RuntimeInfoPage.cshtml"
     
@@ -121,14 +103,11 @@ using Microsoft.Framework.Runtime;
 #line hidden
 
             WriteLiteral("        <h2>");
-            Write(
 #line 33 "RuntimeInfoPage.cshtml"
-             Resources.RuntimeInfoPage_PackagesFail
+       Write(Resources.RuntimeInfoPage_PackagesFail);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</h2>\r\n");
 #line 34 "RuntimeInfoPage.cshtml"
     }
@@ -140,44 +119,44 @@ using Microsoft.Framework.Runtime;
 
             WriteLiteral("        <table>\r\n            <thead>\r\n                <tr>\r\n                    <" +
 "th>");
-            Write(
 #line 40 "RuntimeInfoPage.cshtml"
-                         Resources.RuntimeInfoPage_PackageNameColumnName
+                   Write(Resources.RuntimeInfoPage_PackageNameColumnName);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</th>\r\n                    <th>");
-            Write(
 #line 41 "RuntimeInfoPage.cshtml"
-                         Resources.RuntimeInfoPage_PackagePathColumnName
+                   Write(Resources.RuntimeInfoPage_PackageVersionColumnName);
 
 #line default
 #line hidden
-            );
+            WriteLiteral("</th>\r\n                    <th>");
+#line 42 "RuntimeInfoPage.cshtml"
+                   Write(Resources.RuntimeInfoPage_PackagePathColumnName);
 
+#line default
+#line hidden
             WriteLiteral("</th>\r\n                </tr>\r\n            </thead>\r\n            <tbody>\r\n");
-#line 45 "RuntimeInfoPage.cshtml"
+#line 46 "RuntimeInfoPage.cshtml"
             
 
 #line default
 #line hidden
 
-#line 45 "RuntimeInfoPage.cshtml"
+#line 46 "RuntimeInfoPage.cshtml"
                bool even = false; 
 
 #line default
 #line hidden
 
             WriteLiteral("\r\n");
-#line 46 "RuntimeInfoPage.cshtml"
+#line 47 "RuntimeInfoPage.cshtml"
             
 
 #line default
 #line hidden
 
-#line 46 "RuntimeInfoPage.cshtml"
+#line 47 "RuntimeInfoPage.cshtml"
              foreach (var package in Model.References.OrderBy(package => package.Name.ToLowerInvariant()))
             {
 
@@ -185,46 +164,40 @@ using Microsoft.Framework.Runtime;
 #line hidden
 
             WriteLiteral("                <tr");
-            WriteAttribute("class", Tuple.Create(" class=\"", 1494), Tuple.Create("\"", 1522), 
-            Tuple.Create(Tuple.Create("", 1502), Tuple.Create<System.Object, System.Int32>(
-#line 48 "RuntimeInfoPage.cshtml"
-                             even?"even":"odd"
-
-#line default
-#line hidden
-            , 1502), false));
+            WriteAttribute("class", Tuple.Create(" class=\"", 1576), Tuple.Create("\"", 1604), 
+            Tuple.Create(Tuple.Create("", 1584), Tuple.Create<System.Object, System.Int32>(even?"even":"odd", 1584), false));
             WriteLiteral(">\r\n                    <td>");
-            Write(
-#line 49 "RuntimeInfoPage.cshtml"
-                         package.Name
-
-#line default
-#line hidden
-            );
-
-            WriteLiteral("</td>\r\n                    <td>");
-            Write(
 #line 50 "RuntimeInfoPage.cshtml"
-                         package.Path
+                   Write(package.Name);
 
 #line default
 #line hidden
-            );
+            WriteLiteral("</td>\r\n                    <td>");
+#line 51 "RuntimeInfoPage.cshtml"
+                   Write(package.Version);
 
-            WriteLiteral("</td>\r\n                </tr>\r\n");
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                    <td>");
 #line 52 "RuntimeInfoPage.cshtml"
+                   Write(package.Path);
+
+#line default
+#line hidden
+            WriteLiteral("</td>\r\n                </tr>\r\n");
+#line 54 "RuntimeInfoPage.cshtml"
                 
 
 #line default
 #line hidden
 
-#line 52 "RuntimeInfoPage.cshtml"
+#line 54 "RuntimeInfoPage.cshtml"
                    even = !even; 
 
 #line default
 #line hidden
 
-#line 52 "RuntimeInfoPage.cshtml"
+#line 54 "RuntimeInfoPage.cshtml"
                                   
             }
 
@@ -232,7 +205,7 @@ using Microsoft.Framework.Runtime;
 #line hidden
 
             WriteLiteral("            </tbody>\r\n        </table>\r\n");
-#line 56 "RuntimeInfoPage.cshtml"
+#line 58 "RuntimeInfoPage.cshtml"
     }
 
 #line default
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cshtml
index 335a572f45..5736c9e9fd 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cshtml
+++ b/src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPage.cshtml
@@ -38,6 +38,7 @@
             <thead>
                 <tr>
                     <th>@Resources.RuntimeInfoPage_PackageNameColumnName</th>
+                    <th>@Resources.RuntimeInfoPage_PackageVersionColumnName</th>
                     <th>@Resources.RuntimeInfoPage_PackagePathColumnName</th>
                 </tr>
             </thead>
@@ -47,6 +48,7 @@
             {
                 <tr class="@(even?"even":"odd")">
                     <td>@package.Name</td>
+                    <td>@package.Version</td>
                     <td>@package.Path</td>
                 </tr>
                 @{ even = !even; }
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs
index 4820d022d6..3e81e14013 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs
@@ -27,22 +27,13 @@ using System
 
             WriteLiteral("\r\n<!DOCTYPE html>\r\n<html");
             WriteAttribute("lang", Tuple.Create(" lang=\"", 85), Tuple.Create("\"", 167), 
-            Tuple.Create(Tuple.Create("", 92), Tuple.Create<System.Object, System.Int32>(
-#line 6 "WelcomePage.cshtml"
-             System.Globalization.CultureInfo.CurrentUICulture.TwoLetterISOLanguageName
-
-#line default
-#line hidden
-            , 92), false));
+            Tuple.Create(Tuple.Create("", 92), Tuple.Create<System.Object, System.Int32>(System.Globalization.CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 92), false));
             WriteLiteral(">\r\n<head>\r\n    <meta charset=\"utf-8\" />\r\n    <title>");
-            Write(
 #line 9 "WelcomePage.cshtml"
-            Resources.WelcomeTitle
+      Write(Resources.WelcomeTitle);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</title>\r\n    <style type=\"text/css\">\r\n        @font-face {\r\n            font-fam" +
 "ily: \'SegoeLight\', helvetica, sans-serif;\r\n            font-weight: normal;\r\n   " +
 "         font-style: normal;\r\n        }\r\n\r\n        body {\r\n            backgroun" +
@@ -135,21 +126,9 @@ using System
 "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHL0rwADANq3ok68n5UR" +
 "AAAAAElFTkSuQmCC\"");
             WriteAttribute("alt", Tuple.Create("\r\n                    alt=\"", 7462), Tuple.Create("\"", 7530), 
-            Tuple.Create(Tuple.Create("", 7489), Tuple.Create<System.Object, System.Int32>(
-#line 168 "WelcomePage.cshtml"
-                          Resources.WelcomePageImageText_LightBulb
-
-#line default
-#line hidden
-            , 7489), false));
+            Tuple.Create(Tuple.Create("", 7489), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LightBulb, 7489), false));
             WriteAttribute("title", Tuple.Create(" title=\"", 7531), Tuple.Create("\"", 7580), 
-            Tuple.Create(Tuple.Create("", 7539), Tuple.Create<System.Object, System.Int32>(
-#line 168 "WelcomePage.cshtml"
-                                                                            Resources.WelcomePageImageText_LightBulb
-
-#line default
-#line hidden
-            , 7539), false));
+            Tuple.Create(Tuple.Create("", 7539), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LightBulb, 7539), false));
             WriteLiteral(" width=\"274\" height=\"274\" /></div>\r\n            <div class=\"browser\" style=\"opaci" +
 "ty: 1; visible: true;\">\r\n                <img src=\"data:image/png;base64,iVBORw0" +
 "KGgoAAAANSUhEUgAAAYAAAAExCAYAAAB1UXVvAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR" +
@@ -265,21 +244,9 @@ using System
 "AAMALXokn/reOBeCwC/ij+HGLcwMAMFj+Kq73f3n0P6eP/nHj+k831tdf+F78z0n8uBI/znGuAAAGwbX" +
 "48c24+P9N+oP/L8AAx5G6SMzC+fMAAAAASUVORK5CYII=\"");
             WriteAttribute("alt", Tuple.Create("\r\n                     alt=\"", 16668), Tuple.Create("\"", 16735), 
-            Tuple.Create(Tuple.Create("", 16696), Tuple.Create<System.Object, System.Int32>(
-#line 171 "WelcomePage.cshtml"
-                           Resources.WelcomePageImageText_Browser
-
-#line default
-#line hidden
-            , 16696), false));
+            Tuple.Create(Tuple.Create("", 16696), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_Browser, 16696), false));
             WriteAttribute("title", Tuple.Create(" title=\"", 16736), Tuple.Create("\"", 16783), 
-            Tuple.Create(Tuple.Create("", 16744), Tuple.Create<System.Object, System.Int32>(
-#line 171 "WelcomePage.cshtml"
-                                                                           Resources.WelcomePageImageText_Browser
-
-#line default
-#line hidden
-            , 16744), false));
+            Tuple.Create(Tuple.Create("", 16744), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_Browser, 16744), false));
             WriteLiteral(" width=\"384\" height=\"305\" /><div>:-)</div>\r\n            </div>\r\n            <div " +
 "class=\"light second\">\r\n                <img src=\"data:image/png;base64,iVBORw0KG" +
 "goAAAANSUhEUgAAARIAAAESCAYAAAAxN1ojAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5c" +
@@ -362,21 +329,9 @@ using System
 "EwaQ6SBSCCOBLOiclnX/70xJpl1t/ykOZHC57E/X+nnTbZ9EoEgC4DE044mHoCJ/F+AAQAgl3zNeDGxu" +
 "QAAAABJRU5ErkJggg==\"");
             WriteAttribute("alt", Tuple.Create("\r\n                    alt=\"", 23205), Tuple.Create("\"", 23273), 
-            Tuple.Create(Tuple.Create("", 23232), Tuple.Create<System.Object, System.Int32>(
-#line 175 "WelcomePage.cshtml"
-                          Resources.WelcomePageImageText_LightBulb
-
-#line default
-#line hidden
-            , 23232), false));
+            Tuple.Create(Tuple.Create("", 23232), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LightBulb, 23232), false));
             WriteAttribute("title", Tuple.Create(" title=\"", 23274), Tuple.Create("\"", 23323), 
-            Tuple.Create(Tuple.Create("", 23282), Tuple.Create<System.Object, System.Int32>(
-#line 175 "WelcomePage.cshtml"
-                                                                            Resources.WelcomePageImageText_LightBulb
-
-#line default
-#line hidden
-            , 23282), false));
+            Tuple.Create(Tuple.Create("", 23282), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LightBulb, 23282), false));
             WriteLiteral(" width=\"274\" height=\"274\" /></div>\r\n            <div class=\"bulb\">\r\n             " +
 "   <img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAVoAAAKSCAYAAACTAhMyA" +
 "AAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54b" +
@@ -477,21 +432,9 @@ using System
 "AIILYDQAiC0AEILgNACCC2A0AIgtABCCyC0AAgtgNACMCcvisIoACT0fwEGAL+BBlr+j4JHAAAAAElFT" +
 "kSuQmCC\"");
             WriteAttribute("alt", Tuple.Create("\r\n                     alt=\"", 31173), Tuple.Create("\"", 31242), 
-            Tuple.Create(Tuple.Create("", 31201), Tuple.Create<System.Object, System.Int32>(
-#line 178 "WelcomePage.cshtml"
-                           Resources.WelcomePageImageText_LightBulb
-
-#line default
-#line hidden
-            , 31201), false));
+            Tuple.Create(Tuple.Create("", 31201), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LightBulb, 31201), false));
             WriteAttribute("title", Tuple.Create(" title=\"", 31243), Tuple.Create("\"", 31292), 
-            Tuple.Create(Tuple.Create("", 31251), Tuple.Create<System.Object, System.Int32>(
-#line 178 "WelcomePage.cshtml"
-                                                                             Resources.WelcomePageImageText_LightBulb
-
-#line default
-#line hidden
-            , 31251), false));
+            Tuple.Create(Tuple.Create("", 31251), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LightBulb, 31251), false));
             WriteLiteral(" width=\"346\" height=\"658\" /></div>\r\n            <div class=\"bottom\">\r\n           " +
 "     <img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABLwAAADKCAYAAACv61n" +
 "1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAKsZJREFUeNrs3VtsXPed2PEzc87" +
@@ -679,50 +622,29 @@ using System
 "643H3SgNOZ3kR8AIAAAAAoIWjGV7UBrLAnc1h1wS8omp1OKzVxqxavihcX60FHHltZ8MF29a16fxojRS" +
 "uBwAAAACghf8vwABfcA5F9k0oGQAAAABJRU5ErkJggg==\"");
             WriteAttribute("alt", Tuple.Create("\r\n                    alt=\"", 46140), Tuple.Create("\"", 46206), 
-            Tuple.Create(Tuple.Create("", 46167), Tuple.Create<System.Object, System.Int32>(
-#line 181 "WelcomePage.cshtml"
-                          Resources.WelcomePageImageText_Skyline
-
-#line default
-#line hidden
-            , 46167), false));
+            Tuple.Create(Tuple.Create("", 46167), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_Skyline, 46167), false));
             WriteAttribute("title", Tuple.Create(" title=\"", 46207), Tuple.Create("\"", 46254), 
-            Tuple.Create(Tuple.Create("", 46215), Tuple.Create<System.Object, System.Int32>(
-#line 181 "WelcomePage.cshtml"
-                                                                          Resources.WelcomePageImageText_Skyline
-
-#line default
-#line hidden
-            , 46215), false));
+            Tuple.Create(Tuple.Create("", 46215), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_Skyline, 46215), false));
             WriteLiteral(" width=\"1212\" height=\"202\" /></div>\r\n        </div>\r\n    </div>\r\n\r\n    <div class" +
 "=\"content\">\r\n        <div class=\"bodyHeadline\">");
-            Write(
 #line 186 "WelcomePage.cshtml"
-                                   Resources.WelcomeHeader
+                             Write(Resources.WelcomeHeader);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</div>\r\n        <div class=\"bodyContent\">");
-            Write(
 #line 187 "WelcomePage.cshtml"
-                                  Resources.WelcomeStarted
+                            Write(Resources.WelcomeStarted);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("</div>\r\n        <a class=\"bodyCTA longer\" href=\"http://go.microsoft.com/fwlink/?L" +
 "inkID=398596&amp;clcid=0x409\">");
-            Write(
 #line 188 "WelcomePage.cshtml"
-                                                                                                        Resources.WelcomeLearnMicrosoftAspNet
+                                                                                                  Write(Resources.WelcomeLearnMicrosoftAspNet);
 
 #line default
 #line hidden
-            );
-
             WriteLiteral("<div>\r\n            <img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAA" +
 "AdCAYAAAD7En+mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOm" +
 "NvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek" +
@@ -755,21 +677,9 @@ using System
 "U1BLaYptsK4VktN9pRq0R9Y5/NMZL8slmC1ioSIu51ezNtkSACQ3HJckjXAX1v8nzsTxLwVBTT99OEiF" +
 "xkMsNIVpu/J6yjhBpEG5mhv7vI8l+AAQB7WiwH/DuungAAAABJRU5ErkJggg==\"");
             WriteAttribute("alt", Tuple.Create("\r\n                alt=\"", 49086), Tuple.Create("\"", 49150), 
-            Tuple.Create(Tuple.Create("", 49109), Tuple.Create<System.Object, System.Int32>(
-#line 190 "WelcomePage.cshtml"
-                      Resources.WelcomePageImageText_LearnMore
-
-#line default
-#line hidden
-            , 49109), false));
+            Tuple.Create(Tuple.Create("", 49109), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LearnMore, 49109), false));
             WriteAttribute("title", Tuple.Create(" title=\"", 49151), Tuple.Create("\"", 49200), 
-            Tuple.Create(Tuple.Create("", 49159), Tuple.Create<System.Object, System.Int32>(
-#line 190 "WelcomePage.cshtml"
-                                                                        Resources.WelcomePageImageText_LearnMore
-
-#line default
-#line hidden
-            , 49159), false));
+            Tuple.Create(Tuple.Create("", 49159), Tuple.Create<System.Object, System.Int32>(Resources.WelcomePageImageText_LearnMore, 49159), false));
             WriteLiteral(" width=\"58\" height=\"29\" /></div>\r\n        </a>\r\n    </div>\r\n\r\n</body>\r\n</html>\r\n");
         }
         #pragma warning restore 1998
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
index 4a0f522d0f..b71080b3ad 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
@@ -96,8 +96,8 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             // Arrange
             var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict);
             libraryManagerMock.Setup(l => l.GetLibraries()).Returns(new ILibraryInformation[] {
-                        new FakeLibraryInformation() { Name ="LibInfo1", Path = "Path1" },
-                        new FakeLibraryInformation() { Name ="LibInfo2", Path = "Path2" },
+                        new FakeLibraryInformation() { Name ="LibInfo1", Version = "1.0.0-beta1", Path = "Path1" },
+                        new FakeLibraryInformation() { Name ="LibInfo2", Version = "1.0.0-beta2", Path = "Path2" },
                     });
 
             RequestDelegate next = _ =>
@@ -128,8 +128,10 @@ namespace Microsoft.AspNet.Diagnostics.Tests
                 string response = Encoding.UTF8.GetString(buffer);
 
                 Assert.True(response.Contains("<td>LibInfo1</td>"));
+                Assert.True(response.Contains("<td>1.0.0-beta1</td>"));
                 Assert.True(response.Contains("<td>Path1</td>"));
                 Assert.True(response.Contains("<td>LibInfo2</td>"));
+                Assert.True(response.Contains("<td>1.0.0-beta2</td>"));
                 Assert.True(response.Contains("<td>Path2</td>"));
             }
         }
@@ -139,6 +141,8 @@ namespace Microsoft.AspNet.Diagnostics.Tests
         {
             public string Name { get; set; }
 
+            public string Version { get; set; }
+
             public string Path { get; set; }
 
             public IEnumerable<string> Dependencies

"); - Write( #line 41 "RuntimeInfoPage.cshtml" - Resources.RuntimeInfoPage_PackagePathColumnName + Write(Resources.RuntimeInfoPage_PackageVersionColumnName); #line default #line hidden - ); + WriteLiteral("	"); +#line 42 "RuntimeInfoPage.cshtml" + Write(Resources.RuntimeInfoPage_PackagePathColumnName); +#line default +#line hidden WriteLiteral("
"); - Write( -#line 49 "RuntimeInfoPage.cshtml" - package.Name - -#line default -#line hidden - ); - - WriteLiteral("	"); - Write( #line 50 "RuntimeInfoPage.cshtml" - package.Path + Write(package.Name); #line default #line hidden - ); + WriteLiteral("	"); +#line 51 "RuntimeInfoPage.cshtml" + Write(package.Version); - WriteLiteral("
"); #line 52 "RuntimeInfoPage.cshtml" + Write(package.Path); + +#line default +#line hidden + WriteLiteral("