diff --git a/src/MusicStore/Views/Account/Login.cshtml b/src/MusicStore/Views/Account/Login.cshtml
index e1c0331315..e64b7d8dc0 100644
--- a/src/MusicStore/Views/Account/Login.cshtml
+++ b/src/MusicStore/Views/Account/Login.cshtml
@@ -17,16 +17,14 @@
                 <hr />
                 @Html.ValidationSummary(true)
                 <div class="form-group">
-                    @*@Html.LabelFor(m => m.UserName, new { @class = "col-md-2 control-label" })*@
-                    <label class="col-md-2 control-label">UserName:</label>
+                    @Html.LabelFor(m => m.UserName, new { @class = "col-md-2 control-label" })
                     <div class="col-md-10">
                         @Html.TextBoxFor(m => m.UserName, new { @class = "form-control" })
                         @*@Html.ValidationMessageFor(m => m.UserName)*@
                     </div>
                 </div>
                 <div class="form-group">
-                    @*@Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })*@
-                    <label class="col-md-2 control-label">Password:</label>
+                    @Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })
                     <div class="col-md-10">
                         @Html.PasswordFor(m => m.Password, new { @class = "form-control" })
                         @*@Html.ValidationMessageFor(m => m.Password)*@
@@ -36,8 +34,7 @@
                     <div class="col-md-offset-2 col-md-10">
                         <div class="checkbox">
                             @Html.CheckBoxFor(m => m.RememberMe)
-                            @*@Html.LabelFor(m => m.RememberMe)*@
-                            <label>Remember Me</label>
+                            @Html.LabelFor(m => m.RememberMe)
                         </div>
                     </div>
                 </div>
@@ -52,12 +49,6 @@
             }
         </section>
     </div>
-
-    @*<div class="col-md-4">
-            <section id="socialLoginForm">
-                @Html.Partial("_ExternalLoginsListPartial", new { Action = "ExternalLogin", ReturnUrl = ViewBag.ReturnUrl })
-            </section>
-        </div>*@
 </div>
 @section Scripts {
     @*Bug : Script helpers are out of scope for alpha*@
diff --git a/src/MusicStore/Views/Account/Register.cshtml b/src/MusicStore/Views/Account/Register.cshtml
index 03ef461d0c..c8e85b78a6 100644
--- a/src/MusicStore/Views/Account/Register.cshtml
+++ b/src/MusicStore/Views/Account/Register.cshtml
@@ -14,22 +14,19 @@
     <hr />
     @Html.ValidationSummary()
     <div class="form-group">
-        @*@Html.LabelFor(m => m.UserName, new { @class = "col-md-2 control-label" })*@
-        <label class="col-md-2 control-label">UserName</label>
+        @Html.LabelFor(m => m.UserName, new { @class = "col-md-2 control-label" })
         <div class="col-md-10">
             @Html.TextBoxFor(m => m.UserName, new { @class = "form-control" })
         </div>
     </div>
     <div class="form-group">
-        @*@Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })*@
-        <label class="col-md-2 control-label">Password</label>
+        @Html.LabelFor(m => m.Password, new { @class = "col-md-2 control-label" })
         <div class="col-md-10">
             @Html.PasswordFor(m => m.Password, new { @class = "form-control" })
         </div>
     </div>
     <div class="form-group">
-        @*@Html.LabelFor(m => m.ConfirmPassword, new { @class = "col-md-2 control-label" })*@
-        <label class="col-md-2 control-label">Confirm Password</label>
+        @Html.LabelFor(m => m.ConfirmPassword, new { @class = "col-md-2 control-label" })
         <div class="col-md-10">
             @Html.PasswordFor(m => m.ConfirmPassword, new { @class = "form-control" })
         </div>
diff --git a/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml b/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml
index 2780702609..1b0a3833a5 100644
--- a/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml
+++ b/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml
@@ -11,22 +11,19 @@
     <hr />
     @*@Html.ValidationSummary()*@
     <div class="form-group">
-        @*@Html.LabelFor(m => m.OldPassword, new { @class = "col-md-2 control-label" })*@
-        <label class="col-md-2 control-label">Old Password</label>
+        @Html.LabelFor(m => m.OldPassword, new { @class = "col-md-2 control-label" })
         <div class="col-md-10">
             @Html.PasswordFor(m => m.OldPassword, new { @class = "form-control" })
         </div>
     </div>
     <div class="form-group">
-        @*@Html.LabelFor(m => m.NewPassword, new { @class = "col-md-2 control-label" })*@
-        <label class="col-md-2 control-label">New Password</label>
+        @Html.LabelFor(m => m.NewPassword, new { @class = "col-md-2 control-label" })
         <div class="col-md-10">
             @Html.PasswordFor(m => m.NewPassword, new { @class = "form-control" })
         </div>
     </div>
     <div class="form-group">
-        @*@Html.LabelFor(m => m.ConfirmPassword, new { @class = "col-md-2 control-label" })*@
-        <label class="col-md-2 control-label">Confirm Password</label>
+        @Html.LabelFor(m => m.ConfirmPassword, new { @class = "col-md-2 control-label" })
         <div class="col-md-10">
             @Html.PasswordFor(m => m.ConfirmPassword, new { @class = "form-control" })
         </div>
diff --git a/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml b/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml
index 97a946f5e3..f6fc18cca5 100644
--- a/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml
+++ b/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml
@@ -26,7 +26,7 @@
         <p>We're running a promotion: all music is free with the promo code: "FREE"</p>
 
         <div class="editor-label">
-            @*@Html.Label("Promo Code")*@
+            @Html.Label("Promo Code")
         </div>
         <div class="editor-field">
             @Html.TextBox("PromoCode")
diff --git a/src/MusicStore/Views/StoreManager/Create.cshtml b/src/MusicStore/Views/StoreManager/Create.cshtml
index 1ecd5edeb0..ab1fb83193 100644
--- a/src/MusicStore/Views/StoreManager/Create.cshtml
+++ b/src/MusicStore/Views/StoreManager/Create.cshtml
@@ -19,8 +19,7 @@
         @Html.ValidationSummary(true)
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.GenreId, "GenreId", new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">GenreId</label>
+            @Html.LabelFor(model => model.GenreId, "GenreId", new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @Html.DropDownList("GenreId", String.Empty)
                 @*@Html.ValidationMessageFor(model => model.GenreId)*@
@@ -28,8 +27,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.ArtistId, "ArtistId", new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">ArtistId</label>
+            @Html.LabelFor(model => model.ArtistId, "ArtistId", new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @Html.DropDownList("ArtistId", String.Empty)
                 @*@Html.ValidationMessageFor(model => model.ArtistId)*@
@@ -37,8 +35,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.Title, new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">Title</label>
+            @Html.LabelFor(model => model.Title, new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @*@Html.EditorFor(model => model.Title)*@
                 @*@Html.ValidationMessageFor(model => model.Title)*@
@@ -46,8 +43,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.Price, new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">Price</label>
+            @Html.LabelFor(model => model.Price, new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @*@Html.EditorFor(model => model.Price)*@
                 @*@Html.ValidationMessageFor(model => model.Price)*@
@@ -55,8 +51,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.AlbumArtUrl, new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">AlbumArtUrl</label>
+            @Html.LabelFor(model => model.AlbumArtUrl, new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @*@Html.EditorFor(model => model.AlbumArtUrl)*@
                 @*@Html.ValidationMessageFor(model => model.AlbumArtUrl)*@
diff --git a/src/MusicStore/Views/StoreManager/Edit.cshtml b/src/MusicStore/Views/StoreManager/Edit.cshtml
index 3b0c1a4ba8..ad70d45f97 100644
--- a/src/MusicStore/Views/StoreManager/Edit.cshtml
+++ b/src/MusicStore/Views/StoreManager/Edit.cshtml
@@ -19,8 +19,7 @@
         @Html.HiddenFor(model => model.AlbumId)
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.GenreId, "GenreId", new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">Genre Id</label>
+            @Html.LabelFor(model => model.GenreId, "GenreId", new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @Html.DropDownList("GenreId", String.Empty)
                 @*@Html.ValidationMessageFor(model => model.GenreId)*@
@@ -28,8 +27,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.ArtistId, "ArtistId", new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">ArtistId</label>
+            @Html.LabelFor(model => model.ArtistId, "ArtistId", new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @Html.DropDownList("ArtistId", String.Empty)
                 @*@Html.ValidationMessageFor(model => model.ArtistId)*@
@@ -37,8 +35,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.Title, new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">Title</label>
+            @Html.LabelFor(model => model.Title, new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @*@Html.EditorFor(model => model.Title)*@
                 @*@Html.ValidationMessageFor(model => model.Title)*@
@@ -46,8 +43,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.Price, new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">Price</label>
+            @Html.LabelFor(model => model.Price, new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @*@Html.EditorFor(model => model.Price)*@
                 @*@Html.ValidationMessageFor(model => model.Price)*@
@@ -55,8 +51,7 @@
         </div>
 
         <div class="form-group">
-            @*@Html.LabelFor(model => model.AlbumArtUrl, new { @class = "control-label col-md-2" })*@
-            <label class="control-label col-md-2">albumArtUrl</label>
+            @Html.LabelFor(model => model.AlbumArtUrl, new { @class = "control-label col-md-2" })
             <div class="col-md-10">
                 @*@Html.EditorFor(model => model.AlbumArtUrl)*@
                 @*@Html.ValidationMessageFor(model => model.AlbumArtUrl)*@