diff --git a/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml b/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml
index c0690507ab..ebdf0b0159 100644
--- a/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml
+++ b/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml
@@ -32,5 +32,8 @@
 }
 
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
+    @*Bug : Script helpers are out of scope for alpha*@
+    @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
diff --git a/src/MusicStore/Views/Account/Login.cshtml b/src/MusicStore/Views/Account/Login.cshtml
index 011e5db254..5100f8b43e 100644
--- a/src/MusicStore/Views/Account/Login.cshtml
+++ b/src/MusicStore/Views/Account/Login.cshtml
@@ -56,5 +56,8 @@
     </div>
 </div>
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
+    @*Bug : Script helpers are out of scope for alpha*@
+    @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
\ No newline at end of file
diff --git a/src/MusicStore/Views/Account/Manage.cshtml b/src/MusicStore/Views/Account/Manage.cshtml
index 4a1c201902..c69125429f 100644
--- a/src/MusicStore/Views/Account/Manage.cshtml
+++ b/src/MusicStore/Views/Account/Manage.cshtml
@@ -26,6 +26,10 @@
         </section>
     </div>
 </div>
+
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
+    @*Bug : Script helpers are out of scope for alpha*@
+    @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
\ No newline at end of file
diff --git a/src/MusicStore/Views/Account/Register.cshtml b/src/MusicStore/Views/Account/Register.cshtml
index 1306c612b1..f6c2107aaf 100644
--- a/src/MusicStore/Views/Account/Register.cshtml
+++ b/src/MusicStore/Views/Account/Register.cshtml
@@ -39,5 +39,8 @@
 }
 
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
+    @*Bug : Script helpers are out of scope for alpha*@
+    @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
\ No newline at end of file
diff --git a/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml b/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml
index abecefc59c..8f51a751d4 100644
--- a/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml
+++ b/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml
@@ -7,29 +7,32 @@
 }
 
 @section Scripts {
+    @*Bug : Script helpers are out of scope for alpha*@
     @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
 
 @*@using (Html.BeginForm())*@
 @*{*@
 
-    <h2>Address And Payment</h2>
-    <fieldset>
-        <legend>Shipping Information</legend>
-        
-        @*@Html.EditorForModel()*@
-    </fieldset>
-    <fieldset>
-        <legend>Payment</legend>
-        <p>We're running a promotion: all music is free with the promo code: "FREE"</p>
+<h2>Address And Payment</h2>
+<fieldset>
+    <legend>Shipping Information</legend>
 
-        <div class="editor-label">
-            @*@Html.Label("Promo Code")*@
-        </div>
-        <div class="editor-field">
-            @Html.TextBox("PromoCode")
-        </div>
-    </fieldset>
+    @*@Html.EditorForModel()*@
+</fieldset>
+<fieldset>
+    <legend>Payment</legend>
+    <p>We're running a promotion: all music is free with the promo code: "FREE"</p>
 
-    <input type="submit" value="Submit Order" />
+    <div class="editor-label">
+        @*@Html.Label("Promo Code")*@
+    </div>
+    <div class="editor-field">
+        @Html.TextBox("PromoCode")
+    </div>
+</fieldset>
+
+<input type="submit" value="Submit Order" />
 @*}*@
\ No newline at end of file
diff --git a/src/MusicStore/Views/Shared/_Layout.cshtml b/src/MusicStore/Views/Shared/_Layout.cshtml
index 4678bf770f..3ac1f2c311 100644
--- a/src/MusicStore/Views/Shared/_Layout.cshtml
+++ b/src/MusicStore/Views/Shared/_Layout.cshtml
@@ -28,10 +28,10 @@
             @*Bug: HtmlHelpers missing*@
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                        @*<li>@Html.ActionLink("Home", "Index", "Home")</li>*@
-                        @await Component.InvokeAsync("GenreMenu")
-@*                        @Html.Action("CartSummary", "ShoppingCart")*@
-                    </ul>
+                    @*<li>@Html.ActionLink("Home", "Index", "Home")</li>*@
+                    @await Component.InvokeAsync("GenreMenu")
+                    @*                        @Html.Action("CartSummary", "ShoppingCart")*@
+                </ul>
                 @await Html.PartialAsync("_LoginPartial")
             </div>
         </div>
@@ -48,11 +48,10 @@
 
     @*Bug: No script helpers yet*@
     @*@Scripts.Render("~/bundles/jquery")
-        @Scripts.Render("~/bundles/bootstrap")
-        @RenderSection("scripts", required: false)*@
-
+        @Scripts.Render("~/bundles/bootstrap")*@
     <script src="~/Scripts/jquery-1.10.2.js"></script>
     <script src="~/Scripts/bootstrap.js"></script>
     <script src="~/Scripts/respond.js"></script>
+    @RenderSection("scripts", required: false)
 </body>
 </html>
\ No newline at end of file
diff --git a/src/MusicStore/Views/StoreManager/Create.cshtml b/src/MusicStore/Views/StoreManager/Create.cshtml
index 33d8324127..27f45c304f 100644
--- a/src/MusicStore/Views/StoreManager/Create.cshtml
+++ b/src/MusicStore/Views/StoreManager/Create.cshtml
@@ -71,5 +71,8 @@
 </div>
 
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
+    @*Bug : Script helpers are out of scope for alpha*@
+    @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
\ No newline at end of file
diff --git a/src/MusicStore/Views/StoreManager/Edit.cshtml b/src/MusicStore/Views/StoreManager/Edit.cshtml
index 0dee9dce8b..97b5281ba2 100644
--- a/src/MusicStore/Views/StoreManager/Edit.cshtml
+++ b/src/MusicStore/Views/StoreManager/Edit.cshtml
@@ -71,5 +71,8 @@
 </div>
 
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryval")
+    @*Bug : Script helpers are out of scope for alpha*@
+    @*@Scripts.Render("~/bundles/jqueryval")*@
+    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
+    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
 }
\ No newline at end of file