diff --git a/src/MusicStore.Spa/Apis/AlbumsApiController.cs b/src/MusicStore.Spa/Apis/AlbumsApiController.cs
index 26b3cdaaec..d8051cecaf 100644
--- a/src/MusicStore.Spa/Apis/AlbumsApiController.cs
+++ b/src/MusicStore.Spa/Apis/AlbumsApiController.cs
@@ -7,6 +7,7 @@ using MusicStore.Models;
 
 namespace MusicStore.Apis
 {
+    [Route("api/albums")]
     public class AlbumsApiController : Controller
     {
         private readonly MusicStoreContext _storeContext;
@@ -16,7 +17,7 @@ namespace MusicStore.Apis
             _storeContext = storeContext;
         }
 
-        [Route("api/albums")]
+        [HttpGet]
         public async Task<ActionResult> Paged(int page = 1, int pageSize = 50, string sortBy = null)
         {
             var albums = await _storeContext.Albums
@@ -28,7 +29,7 @@ namespace MusicStore.Apis
             return Json(albums);
         }
 
-        [Route("api/albums/all")]
+        [HttpGet("all")]
         public async Task<ActionResult> All()
         {
             var albums = await _storeContext.Albums
@@ -40,7 +41,7 @@ namespace MusicStore.Apis
             return Json(albums);
         }
 
-        [Route("api/albums/mostPopular")]
+        [HttpGet("mostPopular")]
         public async Task<ActionResult> MostPopular(int count = 6)
         {
             count = count > 0 && count < 20 ? count : 6;
@@ -52,7 +53,7 @@ namespace MusicStore.Apis
             return Json(albums);
         }
 
-        [Route("api/albums/{albumId:int}")]
+        [HttpGet("{albumId:int}")]
         public async Task<ActionResult> Details(int albumId)
         {
             // TODO: Remove this when EF supports related entity loading
@@ -70,7 +71,6 @@ namespace MusicStore.Apis
             return Json(album);
         }
 
-        //[Route("api/albums")]
         [HttpPost]
         //[Authorize(Roles = "Administrator")]
         [Authorize(ClaimTypes.Role, "Administrator")]
@@ -98,8 +98,7 @@ namespace MusicStore.Apis
             };
         }
 
-        //[Route("api/albums/{albumId:int}/update")]
-        [HttpPut]
+        [HttpPut("{albumId:int}/update")]
         //[Authorize(Roles = "Administrator")]
         [Authorize(ClaimTypes.Role, "Administrator")]
         public async Task<ActionResult> UpdateAlbum(int albumId)
@@ -133,8 +132,7 @@ namespace MusicStore.Apis
             };
         }
 
-        //[Route("api/albums/{albumId:int}")]
-        [HttpDelete]
+        [HttpDelete("{albumId:int}")]
         //[Authorize(Roles = "Administrator")]
         [Authorize(ClaimTypes.Role, "Administrator")]
         public async Task<ActionResult> DeleteAlbum(int albumId)
diff --git a/src/MusicStore.Spa/Apis/ArtistsApiController.cs b/src/MusicStore.Spa/Apis/ArtistsApiController.cs
index 19c28d77b8..f80bd1c75e 100644
--- a/src/MusicStore.Spa/Apis/ArtistsApiController.cs
+++ b/src/MusicStore.Spa/Apis/ArtistsApiController.cs
@@ -6,6 +6,7 @@ using MusicStore.Models;
 
 namespace MusicStore.Apis
 {
+    [Route("api/artists")]
     public class ArtistsApiController : Controller
     {
         private readonly MusicStoreContext _storeContext;
@@ -15,7 +16,7 @@ namespace MusicStore.Apis
             _storeContext = storeContext;
         }
 
-        [Route("api/artists/lookup")]
+        [HttpGet("lookup")]
         public async Task<ActionResult> Lookup()
         {
             var artists = await _storeContext.Artists
diff --git a/src/MusicStore.Spa/Apis/GenresApiController.cs b/src/MusicStore.Spa/Apis/GenresApiController.cs
index ae8dd571b7..dce64af0dc 100644
--- a/src/MusicStore.Spa/Apis/GenresApiController.cs
+++ b/src/MusicStore.Spa/Apis/GenresApiController.cs
@@ -5,6 +5,7 @@ using MusicStore.Models;
 
 namespace MusicStore.Apis
 {
+    [Route("api/genres")]
     public class GenresApiController : Controller
     {
         private readonly MusicStoreContext _storeContext;
@@ -14,7 +15,18 @@ namespace MusicStore.Apis
             _storeContext = storeContext;
         }
 
-        [Route("api/genres/lookup")]
+        [HttpGet]
+        public async Task<ActionResult> GenreList()
+        {
+            var genres = await _storeContext.Genres
+                //.Include(g => g.Albums)
+                .OrderBy(g => g.Name)
+                .ToListAsync();
+
+            return Json(genres);
+        }
+
+        [HttpGet("lookup")]
         public async Task<ActionResult> Lookup()
         {
             var genres = await _storeContext.Genres
@@ -24,7 +36,7 @@ namespace MusicStore.Apis
             return Json(genres);
         }
 
-        [Route("api/genres/menu")]
+        [HttpGet("menu")]
         public async Task<ActionResult> GenreMenuList(int count = 9)
         {
             count = count > 0 && count < 20 ? count : 9;
@@ -39,18 +51,7 @@ namespace MusicStore.Apis
             return Json(genres);
         }
 
-        [Route("api/genres")]
-        public async Task<ActionResult> GenreList()
-        {
-            var genres = await _storeContext.Genres
-                //.Include(g => g.Albums)
-                .OrderBy(g => g.Name)
-                .ToListAsync();
-
-            return Json(genres);
-        }
-
-        [Route("api/genres/{genreId:int}/albums")]
+        [HttpGet("{genreId:int}/albums")]
         public async Task<ActionResult> GenreAlbums(int genreId)
         {
             var albums = await _storeContext.Albums
diff --git a/src/MusicStore.Spa/Gruntfile.js b/src/MusicStore.Spa/Gruntfile.js
index ed0c4c28ac..17270d75ae 100644
--- a/src/MusicStore.Spa/Gruntfile.js
+++ b/src/MusicStore.Spa/Gruntfile.js
@@ -1,5 +1,4 @@
-/// <vs BeforeBuild='dev' Clean='clean' />
-
+/// <vs Clean='clean' />
 // node-debug (Resolve-Path ~\AppData\Roaming\npm\node_modules\grunt-cli\bin\grunt) task:target
 
 module.exports = function (grunt) {