diff --git a/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj b/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
index 7f96cd1..c376ff3 100644
--- a/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
+++ b/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
@@ -234,7 +234,6 @@
     <Content Include="pages\admin-mediacenter.html" />
     <Content Include="pages\admin-view.html" />
     <Content Include="index.html" />
-    <Content Include="pages\admin-edit-playlist.html" />
     <Content Include="pages\new-media.html" />
     <Content Include="pages\partial-adminlogin.html" />
     <Content Include="pages\partial-home.html" />
diff --git a/TeamDBAwesome/TeamDBAwesome/js/adminController.js b/TeamDBAwesome/TeamDBAwesome/js/adminController.js
index 8471ad3..4881473 100644
--- a/TeamDBAwesome/TeamDBAwesome/js/adminController.js
+++ b/TeamDBAwesome/TeamDBAwesome/js/adminController.js
@@ -22,6 +22,7 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
     $scope.showArtistFields = false;
     $scope.showGenreFields = false;
     $scope.showMediaTypeFields = false;
+    $scope.editing = false;
 
 
     $scope.back = function () {
@@ -83,9 +84,12 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
         }
     ]
 
+    $scope.toEdit = function (playlistID) {
+        $scope.editing = true;
+        $scope.getPlaylistTracks(playlistID);
+    }
   
     $scope.getPlaylists = function () {
-        console.log($scope.playlists);
         $scope.playlists = [];
         $http.get("http://localhost:50031/api/GetPlaylistList")
         .success(function (response) {
@@ -93,5 +97,13 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
             console.log(response);
         })
     }
+   $scope.getPlaylistTracks = function (playlistID) {
+        $scope.playlistTracks = [];
+        $http.get("http://localhost:50031/api/GetPlaylist?PlaylistID="+ playlistID)
+        .success(function (response) {
+            $scope.playlistTracks = angular.copy(response);
+            console.log(response);
+        })
 
+    }
 });
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/admin-edit-playlist.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-edit-playlist.html
deleted file mode 100644
index 2899fc1..0000000
--- a/TeamDBAwesome/TeamDBAwesome/pages/admin-edit-playlist.html
+++ /dev/null
@@ -1,8 +0,0 @@
-﻿
-<head>
-    <title></title>
-	<meta charset="utf-8" />
-</head>
-<div ng-controller="adminController">
-
-</div>
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html
index a22aa68..429b243 100644
--- a/TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html
+++ b/TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html
@@ -2,14 +2,43 @@
     <title>Playlist Editor</title>
     <meta charset="utf-8" />
 </head>
-<div ng-controller="adminController" ng-init="getPlaylists();">
-    <a>Create New Playlist</a>
-    <table>
-        <tr ng-repeat="playlist in playlists">
-            <td>{{ playlist.PlaylistID }}</td>
-            <td>{{ playlist.Name }}</td>
-            <td><a ui-sref="admin-edit-playlist">Edit</a></td>
-            <td><a ui-sref="admin-delete-playlist">Delete</a></td>
-        </tr>
-    </table>
-</div>
+<div ng-controller="adminController">
+    <div ng-hide="editing" ng-init="getPlaylists();">
+        <a>Create New Playlist</a>
+        <table>
+            <tr>
+                <td>Playlist Id</td>
+                <td>Playlist Name</td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr ng-repeat="playlist in playlists">
+                <td>{{ playlist.PlaylistID }}</td>
+                <td>{{ playlist.Name }}</td>
+                <td><a ng-click="toEdit(playlist.PlaylistID);">Edit</a></td>
+                <td><a ui-sref="admin-delete-playlist">Delete</a></td>
+            </tr>
+        </table>
+    </div>
+    <div ng-show="editing">
+        <a ng-click="editing=false;" ui-sref="admin-playlist-manager" class="btn btn-lg btn-primary center-block">Back</a>
+        <table>
+            <tr>
+                <td>Track Id</td>
+                <td>Track Name</td>
+                <td>Artist</td>
+                <td>Length</td>
+                <td>Price</td>
+                <td></td>
+            </tr>
+            <tr ng-repeat="track in playlistTracks">
+                <td>{{ track.TrackId }}</td>
+                <td>{{ track.TrackName }}</td>
+                <td>{{ track.artist }}</td>
+                <td>{{ track.Milliseconds }}</td>
+                <td>{{ track.UnitPrice | currency }}</td>
+                <td><a ui-sref="admin-delete-playlist">Delete</a></td>
+            </tr>
+        </table>
+    </div>
+</div>
\ No newline at end of file

Playlist Id	Playlist Name
{{ playlist.PlaylistID }}	{{ playlist.Name }}	Edit	Delete
Track Id	Track Name	Artist	Length	Price
{{ track.TrackId }}	{{ track.TrackName }}	{{ track.artist }}	{{ track.Milliseconds }}	{{ track.UnitPrice \| currency }}	Delete