diff --git a/src/MusicStore/Components/GenreMenuComponent.cs b/src/MusicStore/Components/GenreMenuComponent.cs
index 1b86493ae8..ddf7bdd9aa 100644
--- a/src/MusicStore/Components/GenreMenuComponent.cs
+++ b/src/MusicStore/Components/GenreMenuComponent.cs
@@ -19,20 +19,9 @@ namespace MusicStore.Components
 
         public async Task<IViewComponentResult> InvokeAsync()
         {
-            var genres = await GetGenres();
+            var genres = await DbContext.Genres.Select(g => g.Name).Take(9).ToListAsync();
 
             return View(genres);
         }
-
-        private Task<List<Genre>> GetGenres()
-        {
-            return DbContext.Genres
-                .Include(g => g.Albums).ThenInclude(a => a.OrderDetails)
-                // TODO use nested sum https://github.com/aspnet/EntityFramework/issues/3792
-                //.OrderByDescending(
-                //    g => g.Albums.Sum(a => a.OrderDetails.Sum(od => od.Quantity)))
-                .Take(9)
-                .ToListAsync();
-        }
     }
 }
\ No newline at end of file
diff --git a/src/MusicStore/Controllers/ShoppingCartController.cs b/src/MusicStore/Controllers/ShoppingCartController.cs
index 637bce3a74..d84710db7e 100644
--- a/src/MusicStore/Controllers/ShoppingCartController.cs
+++ b/src/MusicStore/Controllers/ShoppingCartController.cs
@@ -44,13 +44,13 @@ namespace MusicStore.Controllers
         public async Task<IActionResult> AddToCart(int id, CancellationToken requestAborted)
         {
             // Retrieve the album from the database
-            var addedAlbum = DbContext.Albums
-                .Single(album => album.AlbumId == id);
+            var addedAlbum = await DbContext.Albums
+                .SingleAsync(album => album.AlbumId == id);
 
             // Add it to the shopping cart
             var cart = ShoppingCart.GetCart(DbContext, HttpContext);
 
-            cart.AddToCart(addedAlbum);
+            await cart.AddToCart(addedAlbum);
 
             await DbContext.SaveChangesAsync(requestAborted);
             _logger.LogInformation("Album {albumId} was added to the cart.", addedAlbum.AlbumId);
diff --git a/src/MusicStore/Models/CartItem.cs b/src/MusicStore/Models/CartItem.cs
index 64550abf9a..3311528faa 100644
--- a/src/MusicStore/Models/CartItem.cs
+++ b/src/MusicStore/Models/CartItem.cs
@@ -14,7 +14,7 @@ namespace MusicStore.Models
         public int Count { get; set; }
 
         [DataType(DataType.DateTime)]
-        public DateTime DateCreated { get; set; }
+        public DateTime DateCreated { get; set; } 
 
         public virtual Album Album { get; set; }
     }
diff --git a/src/MusicStore/Models/ShoppingCart.cs b/src/MusicStore/Models/ShoppingCart.cs
index 191248f4f2..d040cb5ba1 100644
--- a/src/MusicStore/Models/ShoppingCart.cs
+++ b/src/MusicStore/Models/ShoppingCart.cs
@@ -24,10 +24,10 @@ namespace MusicStore.Models
         public static ShoppingCart GetCart(MusicStoreContext db, string cartId)
             => new ShoppingCart(db, cartId);
 
-        public void AddToCart(Album album)
+        public async Task AddToCart(Album album)
         {
             // Get the matching cart and album instances
-            var cartItem = _dbContext.CartItems.SingleOrDefault(
+            var cartItem = await _dbContext.CartItems.SingleOrDefaultAsync(
                 c => c.CartId == _shoppingCartId
                 && c.AlbumId == album.AlbumId);
 
@@ -139,7 +139,7 @@ namespace MusicStore.Models
             foreach (var item in cartItems)
             {
                 //var album = _db.Albums.Find(item.AlbumId);
-                var album = _dbContext.Albums.Single(a => a.AlbumId == item.AlbumId);
+                var album = await _dbContext.Albums.SingleAsync(a => a.AlbumId == item.AlbumId);
 
                 var orderDetail = new OrderDetail
                 {
diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 489461bc05..61b6f24657 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -99,7 +99,7 @@ namespace MusicStore
         //The allowed values are Development,Staging and Production
         public void ConfigureDevelopment(IApplicationBuilder app, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole(minLevel: LogLevel.Warning);
+            loggerFactory.AddConsole(minLevel: LogLevel.Information);
 
             // StatusCode pages to gracefully handle status codes 400-599.
             app.UseStatusCodePagesWithRedirects("~/Home/StatusCodePage");
diff --git a/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml b/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml
index 103404129f..601d74c824 100644
--- a/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml
+++ b/src/MusicStore/Views/Shared/Components/GenreMenu/Default.cshtml
@@ -1,12 +1,12 @@
-@model IEnumerable<Genre>
+@model IEnumerable<string>
 
 <li class="dropdown">
     <a asp-controller="Store" asp-action="Index" class="dropdown-toggle" data-toggle="dropdown">Store <b class="caret"></b></a>
     <ul class="dropdown-menu">
-        @foreach (var genre in Model)
+        @foreach (var genreName in Model)
         {
             <li>
-                <a asp-controller="Store" asp-action="Browse" asp-route-Genre="@genre.Name">@genre.Name</a>
+                <a asp-controller="Store" asp-action="Browse" asp-route-Genre="@genreName">@genreName</a>
             </li>
         }
         <li class="divider"></li>