diff --git a/app/controllers/controllers.js b/app/controllers/controllers.js
index d97435f..1abaf79 100644
--- a/app/controllers/controllers.js
+++ b/app/controllers/controllers.js
@@ -1,194 +1,205 @@
-var app = angular.module('janu');
-
-app.controller('januController', ['$scope','$http','$interval', function ($scope,$http,$interval){
-	var janu = $scope;
-
-
-  $scope.gameInSession = false;
-  $scope.init = function (){
-  	$http.get('data/output.json').success(function(data){
-		janu.songs = data;
-		janu.startGame();
-	});
-  };
-  // start game
-  $scope.startGame = function () {
-    // reset all game variables
-    $scope.timelineSongs = [];
-    $scope.timelineYears = [];
-    $scope.currentSong = undefined;
-    $scope.currentAnswer = undefined;
-    $scope.score = {};
-    $scope.score.round = 0;
-    $scope.timeLeft = 15;
-    $scope.score.total = 0;
-    $scope.markerSet = false;
-    $scope.comboplyer = 1;
-
-    // this is the first song the user guesses
-    firstSong = fetchNewSong();
-    $('#album-cover').addClass('no-blur'); 
-    playSong(firstSong);
-
-    $scope.gameInSession = true;
-
-    // start the timer
-    $interval(function(){
-      timeLeft = getTimeLeft();
-      	if(timeLeft<16){
-    		$scope.timeLeft = timeLeft; 
-    		if(timeLeft==15){
-    			$('#album-cover').addClass('animate-blur');
-    		}
-    		if(timeLeft==14){
-    			$('#album-cover').addClass('no-blur');
-    		}
-      	}
-    	else
-    		$scope.timeLeft = 15;
-      if (timeLeft <= 0) {
-      	$('#album-cover').removeClass('animate-blur');
-    	$('#album-cover').removeClass('no-blur');
-        checkAnswer();
-      }
-    }, 1000);
-  }
-
-  $scope.isSelected = function (index) {
-    if ($scope.currentAnswer === index)
-      return "timeline-selected"
-    else
-      return ""
-  }
-
-  $scope.markerHovers = function (index) {
-    //if marker is set, nothing should have the hover class
-    if ($scope.markerSet)
-      return "";
-
-    if (index === $scope.timelineHoverIndex)
-      return "timeline-hover";
-    else
-      return "";
-  }
-
-  $scope.placeMarker = function () {
-    index = markerIndex();
-
-    //if it's the final span, then represent as -1
-    if (index === $scope.timelineSongs.length)
-      index = -1;
-
-    selectSpan(index);
-  }
-
-  markerIndex = function () {
-    //get center x of marker and width of timeline
-		$songCircle = $("#current-song-circle");
-    centerX = $songCircle.offset().left + $songCircle.width() / 2;
-    width = $("#timeline").width();
-
-    //calculate index
-    return Math.floor(($scope.timelineSongs.length+1) * (centerX / width))
-  }
-
-  $scope.moveMarker = function(e){
-    if(!$scope.markerSet)
-      $("#current-song-circle").css({left:e.pageX});
-
-    // update timeline-hover class of relevant span
-    index = markerIndex();
-    //if it's the final span, then represent as -1
-    if (index === $scope.timelineSongs.length)
-      index = -1;
-    $scope.timelineHoverIndex = index;
-	};
-
-	$scope.addMarkerToGUI = function(e){
-		$("#current-song-circle").css({width:'60px', height:'60px'});
-	};
-	$scope.timelineSpanWidth = function (){
-		return calculateWidths(janu.timelineSongs.length+1)-0.2;
-	};
-
-  selectSpan = function (index) {
-  	if(index === $scope.currentAnswer){
-  		$scope.markerSet = false;
-  		$scope.currentAnswer = undefined;
-  		$scope.score.round = 0;
-  	}
-  	else{
-  		$scope.markerSet = true;
-  		$scope.currentAnswer = index;
-  		$scope.score.round = getTimeLeft();
-  	}
-  }
-
-  // returns a new song to play
-  function fetchNewSong() {
-		var years = _.difference(_.keys(janu.songs),janu.timelineYears);
-		var year = years[Math.floor(Math.random()*years.length)];
-		var randomSong = getRandomSong(janu.songs[year]);
-		randomSong.year = year;
-
-    $scope.currentSong = randomSong;
-    $scope.currentYear = year;
-
-    return randomSong;
-  }
-
-  // adds the song to timeline
-  function addSongToTimeline(song) {
-		janu.timelineSongs.push($scope.currentSong);
-    janu.timelineSongs = _.sortBy(janu.timelineSongs, function (song) { return parseInt(song.year); })
-		janu.timelineYears.push($scope.currentYear);
-		janu.timelineYears.sort();
-  }
-
-  function checkAnswer() {
-    ans = $scope.currentAnswer ;
-
-    if (ans === undefined || ans === null) {
-      // user hasn't chosen an answer, should skip to bottom
-    }
-    else if($scope.timelineSongs.length==0){
-    	answerSuccess();
-    }
-    else if (ans === 0) {
-      if ($scope.currentYear <= $scope.timelineSongs[0].year)
-        answerSuccess();
-    } else if (ans === -1) {
-      if ($scope.currentYear >= _.last($scope.timelineSongs).year)
-        answerSuccess();
-    } else {
-      if ($scope.currentYear >= $scope.timelineSongs[ans-1].year &&
-          $scope.currentYear <= $scope.timelineSongs[ans].year)
-        answerSuccess();
-      else
-      	$scope.comboplyer = 1;
-    }
-
-    //clear the selection
-    $scope.currentAnswer = null;
-
-    newSong = fetchNewSong();
-    playSong(newSong);
-    $scope.markerSet = false;
-    $scope.score.round = 0;
-
-  }
-
-  function answerSuccess() {
-    addSongToTimeline($scope.currentSong); 
-    $scope.score.total += ($scope.score.round * $scope.comboplyer);
-  	$scope.comboplyer++;
-  }
-
-}]);
-
-function getRandomSong(year){
-	return year[Math.floor(Math.random()*year.length)];
-}
-
-
-
+
+var app = angular.module('janu');
+
+app.controller('januController', ['$scope','$http','$interval', function ($scope,$http,$interval){
+	var janu = $scope;
+
+
+  $scope.gameInSession = false;
+  $scope.init = function (){
+  	$http.get('data/output.json').success(function(data){
+		janu.songs = data;
+		janu.startGame();
+	});
+  };
+  // start game
+  $scope.startGame = function () {
+    // reset all game variables
+    $scope.timelineSongs = [];
+    $scope.timelineYears = [];
+    $scope.currentSong = undefined;
+    $scope.currentAnswer = undefined;
+    $scope.score = {};
+    $scope.score.round = 0;
+    $scope.score.total = 0;
+    $scope.gameInSession = true;
+    $scope.markerSet = false;
+    $scope.comboplyer = 1;
+    $scope.roundActive = false;
+
+    
+    // this is the first song the user guesses
+    firstSong = fetchNewSong();
+    $('#album-cover').addClass('no-blur'); 
+    playSong(firstSong);
+    $scope.roundActive = true;
+
+    // start the timer
+    $interval(function(){
+      timeLeft = getTimeLeft();
+      if(timeLeft<16){
+        $scope.timeLeft = timeLeft; 
+        if(timeLeft==15){
+          $('#album-cover').addClass('animate-blur');
+        }
+        if(timeLeft==14){
+          $('#album-cover').addClass('no-blur');
+        }
+      }
+      else
+        $scope.timeLeft = 15;
+      if (timeLeft <= 0) {
+        $('#album-cover').removeClass('animate-blur');
+        $('#album-cover').removeClass('no-blur');
+        if ($scope.roundActive) {
+          $scope.roundActive = false;
+          checkAnswer();
+        }
+      }
+    }, 1000);
+  }
+
+  $scope.timeLeft = function () {
+    return Math.min(0, getTimeLeft());
+  }
+
+  $scope.isSelected = function (index) {
+    if ($scope.currentAnswer === index)
+      return "timeline-selected"
+    else
+      return ""
+  }
+
+  $scope.markerHovers = function (index) {
+    //if marker is set, nothing should have the hover class
+    if ($scope.markerSet)
+      return "";
+
+    if (index === $scope.timelineHoverIndex)
+      return "timeline-hover";
+    else
+      return "";
+  }
+
+  $scope.placeMarker = function () {
+    index = markerIndex();
+
+    //if it's the final span, then represent as -1
+    if (index === $scope.timelineSongs.length)
+      index = -1;
+
+    selectSpan(index);
+  }
+
+  markerIndex = function () {
+    //get center x of marker and width of timeline
+		$songCircle = $("#current-song-circle");
+    centerX = $songCircle.offset().left + $songCircle.width() / 2;
+    width = $("#timeline").width();
+
+    //calculate index
+    return Math.floor(($scope.timelineSongs.length+1) * (centerX / width))
+  }
+
+  $scope.moveMarker = function(e){
+    if(!$scope.markerSet)
+      $("#current-song-circle").css({left:e.pageX});
+
+    // update timeline-hover class of relevant span
+    index = markerIndex();
+    //if it's the final span, then represent as -1
+    if (index === $scope.timelineSongs.length)
+      index = -1;
+    $scope.timelineHoverIndex = index;
+	};
+
+	$scope.addMarkerToGUI = function(e){
+		$("#current-song-circle").css({width:'60px', height:'60px'});
+	};
+	$scope.timelineSpanWidth = function (){
+		return calculateWidths(janu.timelineSongs.length+1)-0.2;
+	};
+
+  selectSpan = function (index) {
+  	if(index === $scope.currentAnswer){
+  		$scope.markerSet = false;
+  		$scope.currentAnswer = undefined;
+  		$scope.score.round = 0;
+  	}
+  	else{
+  		$scope.markerSet = true;
+  		$scope.currentAnswer = index;
+  		$scope.score.round = getTimeLeft();
+  	}
+  }
+
+  // returns a new song to play
+  function fetchNewSong() {
+		var years = _.difference(_.keys(janu.songs),janu.timelineYears);
+		var year = years[Math.floor(Math.random()*years.length)];
+		var randomSong = getRandomSong(janu.songs[year]);
+		randomSong.year = year;
+
+    $scope.currentSong = randomSong;
+    $scope.currentYear = year;
+
+    return randomSong;
+  }
+
+  // adds the song to timeline
+  function addSongToTimeline(song) {
+		janu.timelineSongs.push($scope.currentSong);
+    janu.timelineSongs = _.sortBy(janu.timelineSongs, function (song) { return parseInt(song.year); })
+		janu.timelineYears.push($scope.currentYear);
+		janu.timelineYears.sort();
+  }
+
+  function checkAnswer() {
+    ans = $scope.currentAnswer ;
+
+    if (ans === undefined || ans === null) {
+      // user hasn't chosen an answer, should skip to bottom
+    }
+    else if($scope.timelineSongs.length==0){
+    	answerSuccess();
+    }
+    else if (ans === 0) {
+      if ($scope.currentYear <= $scope.timelineSongs[0].year)
+        answerSuccess();
+    } else if (ans === -1) {
+      if ($scope.currentYear >= _.last($scope.timelineSongs).year)
+        answerSuccess();
+    } else {
+      if ($scope.currentYear >= $scope.timelineSongs[ans-1].year &&
+          $scope.currentYear <= $scope.timelineSongs[ans].year)
+        answerSuccess();
+      else
+      	$scope.comboplyer = 1;
+    }
+
+    //clear the selection
+    $scope.currentAnswer = null;
+
+    newSong = fetchNewSong();
+    playSong(newSong);
+    $scope.markerSet = false;
+    $scope.score.round = 0;
+    $scope.roundActive = true;
+
+  }
+
+  function answerSuccess() {
+    addSongToTimeline($scope.currentSong); 
+    $scope.score.total += ($scope.score.round * $scope.comboplyer);
+  	$scope.comboplyer++;
+  }
+
+}]);
+
+function getRandomSong(year){
+	return year[Math.floor(Math.random()*year.length)];
+}
+
+
+
+
diff --git a/app/controllers/controllers2.js b/app/controllers/controllers2.js
new file mode 100644
index 0000000..39ba60c
--- /dev/null
+++ b/app/controllers/controllers2.js
@@ -0,0 +1,198 @@
+
+var app = angular.module('janu');
+
+app.controller('januController', ['$scope','$http','$interval','$timeout', function ($scope,$http,$interval,$timeout){
+	var janu = $scope;
+
+  $scope.init = function (){
+  	$http.get('data/output.json').success(function(data){
+		janu.songs = data;
+		janu.startGame();
+	});
+  };
+
+  $scope.gameInSession = false;
+
+  // start game
+  $scope.startGame = function () {
+    // reset all game variables
+    $scope.timelineSongs = [];
+    $scope.timelineYears = [];
+    $scope.currentSong = undefined;
+    $scope.currentAnswer = undefined;
+    $scope.score = {};
+    $scope.score.round = 0;
+    $scope.score.total = 0;
+    $scope.gameInSession = true;
+    $scope.markerSet = false;
+    $scope.roundActive = false;
+
+    // this is the first song the user guesses
+    firstSong = fetchNewSong();
+    $('#album-cover').addClass('no-blur'); 
+    playSong(firstSong);
+    $scope.roundActive = true;
+
+    // start the timer
+    $interval(function(){
+      timeLeft = getTimeLeft();
+      if(timeLeft<16){
+    		$scope.timeLeft = timeLeft; 
+    		if(timeLeft==15){
+    			$('#album-cover').addClass('animate-blur');
+    		}
+    		if(timeLeft==14){
+    			$('#album-cover').addClass('no-blur');
+    		}
+      }
+    	else
+    		$scope.timeLeft = 15;
+      if (timeLeft <= 0) {
+      	$('#album-cover').removeClass('animate-blur');
+        $('#album-cover').removeClass('no-blur');
+        if ($scope.roundActive) {
+          $scope.roundActive = false;
+          checkAnswer();
+        }
+      }
+    }, 1000);
+  }
+
+  $scope.timeLeft = function () {
+    return Math.min(0, getTimeLeft());
+  }
+
+  $scope.isSelected = function (index) {
+    if ($scope.currentAnswer === index)
+      return "timeline-selected"
+    else
+      return ""
+  }
+
+  $scope.markerHovers = function (index) {
+    //if marker is set, nothing should have the hover class
+    if ($scope.markerSet)
+      return "";
+
+    if (index === $scope.timelineHoverIndex)
+      return "timeline-hover";
+    else
+      return "";
+  }
+
+  $scope.placeMarker = function () {
+    index = markerIndex();
+
+    //if it's the final span, then represent as -1
+    if (index === $scope.timelineSongs.length)
+      index = -1;
+
+    selectSpan(index);
+  }
+
+  markerIndex = function () {
+    //get center x of marker and width of timeline
+		$songCircle = $("#current-song-circle");
+    centerX = $songCircle.offset().left + $songCircle.width() / 2;
+    width = $("#timeline").width();
+
+    //calculate index
+    return Math.floor(($scope.timelineSongs.length+1) * (centerX / width))
+  }
+
+  $scope.moveMarker = function(e){
+    if(!$scope.markerSet)
+      $("#current-song-circle").css({left:e.pageX});
+
+    // update timeline-hover class of relevant span
+    index = markerIndex();
+    //if it's the final span, then represent as -1
+    if (index === $scope.timelineSongs.length)
+      index = -1;
+    $scope.timelineHoverIndex = index;
+	};
+
+	$scope.addMarkerToGUI = function(e){
+		$("#current-song-circle").css({width:'60px', height:'60px'});
+	};
+	$scope.timelineSpanWidth = function (){
+		return calculateWidths(janu.timelineSongs.length+1)-0.2;
+	};
+
+  selectSpan = function (index) {
+  	if(index === $scope.currentAnswer){
+  		$scope.markerSet = false;
+  		$scope.currentAnswer = undefined;
+  		$scope.score.round = 0;
+  	}
+  	else{
+  		$scope.markerSet = true;
+  		$scope.currentAnswer = index;
+  		$scope.score.round = getTimeLeft();
+  	}
+  }
+
+  // returns a new song to play
+  function fetchNewSong() {
+		var years = _.difference(_.keys(janu.songs),janu.timelineYears);
+		var year = years[Math.floor(Math.random()*years.length)];
+		var randomSong = getRandomSong(janu.songs[year]);
+		randomSong.year = year;
+
+    $scope.currentSong = randomSong;
+    $scope.currentYear = year;
+
+    return randomSong;
+  }
+
+  // adds the song to timeline
+  function addSongToTimeline(song) {
+		janu.timelineSongs.push($scope.currentSong);
+    janu.timelineSongs = _.sortBy(janu.timelineSongs, function (song) { return parseInt(song.year); })
+		janu.timelineYears.push($scope.currentYear);
+		janu.timelineYears.sort();
+  }
+
+  function checkAnswer() {
+    ans = $scope.currentAnswer ;
+
+    if (ans === undefined || ans === null) {
+      // user hasn't chosen an answer, should skip to bottom
+    }
+    else if($scope.timelineSongs.length==0){
+    	answerSuccess();
+    }
+    else if (ans === 0) {
+      if ($scope.currentYear <= $scope.timelineSongs[0].year)
+        answerSuccess();
+    } else if (ans === -1) {
+      if ($scope.currentYear >= _.last($scope.timelineSongs).year)
+        answerSuccess();
+    } else {
+      if ($scope.currentYear >= $scope.timelineSongs[ans-1].year &&
+          $scope.currentYear <= $scope.timelineSongs[ans].year)
+        answerSuccess();
+    }
+
+    //clear the selection
+    $scope.currentAnswer = null;
+
+    newSong = fetchNewSong();
+    playSong(newSong);
+    $scope.markerSet = false;
+    $scope.score.round = 0;
+    $scope.roundActive = true;
+  }
+
+  function answerSuccess() {
+    addSongToTimeline($scope.currentSong); 
+    $scope.score.total += $scope.score.round;
+    $scope.currentSong.success = true;
+  }
+
+}]);
+
+function getRandomSong(year){
+	return year[Math.floor(Math.random()*year.length)];
+}
+
diff --git a/app/partials/game.html b/app/partials/game.html
index 9121048..208f2ee 100644
--- a/app/partials/game.html
+++ b/app/partials/game.html
@@ -1,10 +1,10 @@
 
 
-<div id="game-header"><h2><a href="/">BACK</a></div>
+<div id="game-header"><h2><a href="/"><img src="content/image/logo.png" alt="logo" id="logo" /> <h2>Saturn</h2></a></div>
 <div class="rings-in-back"></div>
 <div class="rings-in-front"></div>
 
-<div id="song-details">
+<div id="song-details" class="hidden">
 	<h2 class="title">{{currentSong.name}}</h2>
 	<h2>{{currentSong.artist_name}}</h2>
 	<h2>{{currentSong.year}}</h2>
diff --git a/app/partials/start.html b/app/partials/start.html
index 4c69fee..68e6eda 100644
--- a/app/partials/start.html
+++ b/app/partials/start.html
@@ -1,6 +1,6 @@
 <div id="start">
 	<img src="content/image/logo.png" alt="logo" id="logo" />
-	<h1>SATURN</h1>
+	<h1>Saturn</h1>
 	
 	<p>Expand your music collection and <br>guess when music was made!</p>
 	<a href="/game"><button>Play!</button></a>
diff --git a/app/partials/win.html b/app/partials/win.html
index 784c12a..4b42bbb 100644
--- a/app/partials/win.html
+++ b/app/partials/win.html
@@ -1,6 +1,6 @@
-<div class="summary-song correct"></div>
-<div class="summary-song wrong"></div>
-<div class="summary-song correct"></div>
-<div class="summary-song wrong"></div>
-<div class="summary-song correct"></div>
-<div class="summary-song wrong"></div>
\ No newline at end of file
+<div id="win">
+	<img src="content/image/logo.png" alt="logo" id="logo" />
+
+	<h2>YOU WON!</h2>
+	<p>Hope you had fun! Here are all the songs:</p>
+</div>
\ No newline at end of file
diff --git a/content/style.css b/content/style.css
index 0f29dfb..b6bbb4f 100644
--- a/content/style.css
+++ b/content/style.css
@@ -69,7 +69,20 @@ label {
 #game-header {
     background: #eee;
     width: 100%;
-    padding: 25px;
+    padding: 5px 15px;
+}
+
+#game-header #logo {
+    height: 60px;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+#game-header h2 {
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 34px;
+    padding-left: 10px;
 }
 
 .caret-down {
@@ -119,7 +132,7 @@ label {
     border-radius: 50% 50% 0 0;
     -moz-border-radius: 50% 50% 0 0;
     -webkit-border-radius: 50% 50% 0 0;
-    border-top: 4px solid #ff9000;
+    border-top: 8px solid #ff9000;
     margin: auto;
     position: relative;
     top: 177px;
@@ -135,7 +148,7 @@ label {
     border-radius: 50% 50%;
     -moz-border-radius: 50% 50%;
     -webkit-border-radius: 50% 50%;
-    border-bottom: 4px solid #ff9000;
+    border-bottom: 8px solid #ff9000;
     margin: auto;
     margin-bottom: -40px;
     position: relative;
@@ -171,7 +184,7 @@ label {
 }
 
 .title {
-    font-size: 24px;
+    font-size: 24px !important;
     font-weight: bold;
 }
 
@@ -226,10 +239,11 @@ label {
     margin-left: -200px;
     top: 380px;
     text-align: center;
+    font-size: 16px;
 }
 
 #song-details h2 {
-    font-size: 24px;
+    font-size: 18px;
 }
 
 #current-song-circle, .song-circle {
@@ -323,10 +337,10 @@ label {
     font-size: 24px;
     border-radius: 15px;
     border-bottom: 5px solid rgba(0,0,0,0.2);
-    padding-bottom: 25px;
+    padding-bottom: 45px;
 }
 
-#start #logo {
+#start #logo, #win #logo {
     width: 250px;
     margin-bottom: 25px;
 }
@@ -343,7 +357,7 @@ button {
 }
 
 #start h1 {
-    margin-bottom: 40px;
+    margin-bottom: 20px;
     color: #202020;
 }
 
diff --git a/scripts/musicPlayer.js b/scripts/musicPlayer.js
index d0c0115..c14c1b0 100644
--- a/scripts/musicPlayer.js
+++ b/scripts/musicPlayer.js
@@ -1,5 +1,7 @@
 var audio = new Audio();
-var TIME_PER_SONG = 15.0;
+var TIME_PER_SONG = 20.0;
+var TIME_BETWEEN_ROUNDS = 5.0;
+var TIME_PER_ROUND = TIME_PER_SONG - TIME_BETWEEN_ROUNDS;
 
 function playSong(song){
   previewURL(song.song_id, function (preview_url) {
@@ -7,7 +9,7 @@ function playSong(song){
     var skipped = false;
     audio.addEventListener("canplay",function(){
       if(!skipped){
-        audio.currentTime = 30.0-TIME_PER_SONG;
+        audio.currentTime = 30.0 - TIME_PER_SONG;
         skipped=true;
       }
     });
@@ -15,6 +17,10 @@ function playSong(song){
   });
 }
 
+function stopSong () {
+  audio.stop();
+}
+
 function previewURL(songId, callback) {
   BASE_URL = "https://api.spotify.com/v1/tracks/";
   $.get(BASE_URL + songId, function (data) {
@@ -22,9 +28,19 @@ function previewURL(songId, callback) {
   });
 }
 
-function getTimeLeft(){
-	if(audio.duration)
-		return Math.ceil(audio.duration-audio.currentTime);
-	else
+// get the time left in round
+function getTimeLeft() {
+	if (audio.duration) {
+    return Math.ceil(audio.duration - audio.currentTime - TIME_BETWEEN_ROUNDS);
+  }
+	else {
 		return 0;
+  }
+}
+
+function isPlaying() {
+  if (audio.duration)
+    return true;
+  else
+    return false;
 }