diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp
index d9529030b..9dce8ee1d 100644
--- a/src/main/webapp/WEB-INF/pages/main_new.jsp
+++ b/src/main/webapp/WEB-INF/pages/main_new.jsp
@@ -60,7 +60,7 @@
     </head>
 
     <body class="animated fadeIn" ng-app="goatApp">
-        <section id="container">
+        <section id="container" ng-controller="goatLesson">
             <header id="header">
                 <!--logo start-->
                 <div class="brand">
@@ -72,8 +72,8 @@
                         <i class="fa fa-bars"></i>
                     </button>
                 </div><!--toggle navigation end-->
-                <div class="lessonTitle">
-                    <h1>Lesson Title in here</h1>
+                <div class="lessonTitle" >
+                    <h1 id="lessonTitle">Lesson Title in here</h1>
                 </div><!--lesson title end-->
                 <div class="user-nav pull-right">
                     <button type="button" class="btn btn-default">
@@ -90,7 +90,7 @@
 
             <!--sidebar left start-->
             <aside class="sidebar">
-                <div id="leftside-navigation" class="nano" ng-controller="goatLessonMenu">
+                <div id="leftside-navigation" class="nano">
                     <ul class="nano-content">
                         <li class="sub-menu" ng-repeat="item in menuTopics">
                             <a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
@@ -112,27 +112,21 @@
             <!--main content start-->
             <section class="main-content-wrapper">
 
-                <section id="main-content" ng-controller="lessonHelpController">
+                <section id="main-content" > <!-- ng-controller="lessonController" -->
                     <div class="row">
                         <div class="col-md-8">
                             <div class="col-md-12" align="left">
                                 <div class="panel">
                                     <div class="panel-body">
-                                        <button type="button" id="showSourceBtn" class="btn btn-primary btn-xs">Java [Source]</button>
-                                        <button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs">Solution</button>
-					<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs">Lesson Plan</button>
+                                        <button type="button" id="showSourceBtn" class="btn btn-primary btn-xs" ng-click="showLessonSource()">Java [Source]</button>
+                                        <button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs" ng-click="showLessonSolution()">Solution</button>
+					<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs" ng-click="showLessonPlan()">Lesson Plan</button>
+					<button type="button" id="showHintsBtn" class="btn btn-primary btn-xs"  ng-click="viewHints()">Hints</button>
                                     </div>
                                 </div>
+				
                             </div>
                             <div class="col-md-12">
-                                <!--<div class="panel" id="buttonPanel">-->
-                                    <!--<button type="button" id="showParamsCookiesBtn" class="btn btn-primary btn-xs">Params/Cookies</button>-->
-                                    <!--<button type="button" id="showHintsBtn" class="btn btn-primary btn-xs lessonHelpBtn">Hints</button>-->
-                                    <!--<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs lessonHelpBtn">Lesson Plan</button>-->
-                                    <!--<button type="button" id="showSourceBtn" class="btn btn-primary btn-xs lessonHelpBtn">Java [Source]</button> <!-- ng-click="showSource('lg') -->
-                                    <!--<button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs lessonHelpBtn">Solution</button>-->
-				    <!-- ng-click="showSolution('lg') -->
-                                <!--</div> -->
                                 <div class="panel" >
                                     <div class="panel-body" id="lesson_content">    
                                         <b>This should default to the "How to Work with Webgoat" lesson</b>
@@ -146,15 +140,9 @@
                                 <div class="panel">
                                     <div class="panel-body">
                                         <div align="left">
-                                            <button id="tshowParamsCookiesBtn" type="button" class="btn btn-xs" ng-click="viewCookiesAndParams()">Params / Cookies</button>
-                                            <button id="showHintsBtn" type="button" class="btn btn-xs">Hints</button>
-                                            
+					    <h3>Cookies / Parameters</h3>
                                         </div>
                                         <hr />
-					<div id="hintsView">
-				            <h3>Hints</h3>
-				            <p>{{scope.hints}}</p>
-					</div>
 					<div id="cookiesAndParamsView">
 					    <div class="cookiesView">
 						<h4>Cookies</h4>
@@ -179,7 +167,7 @@
 						<tr><th>Param</th><th>Value</th></tr>
 					    </thead>
 					    <tbody>
-						<tr ng-repeat="param in params">
+						<tr ng-repeat="param in parameters">
 						    <td>{{param.name}}</td>
 						    <td>{{param.value}}</td>
 						</tr>						
@@ -194,6 +182,19 @@
                         </div><!--col-md-4 end-->         
                     </div>
                     <div id="lessonHelpsWrapper">
+			<div class="row lessonHelp" id="lesson_hint_row">
+                            <div class="col-md-12">
+                                <h4>Hints</h4>
+                                <div class="panel" >
+                                    <div class="panel-body" id="lesson_hint">
+					<span class="glyphicon-class glyphicon glyphicon-circle-arrow-left" id="showPrevHintBtn" ng-click="viewPrevHint()"></span>
+					<span class="glyphicon-class glyphicon glyphicon-circle-arrow-right" id="showNextHintBtn" ng-click="viewNextHint()"></span>
+					<br/>
+					{{curHint}}
+                                    </div>                                    
+                                </div>
+                            </div>
+                        </div>
                         <div class="row lessonHelp" id="lesson_cookies_row">
                             <div class="col-md-12">
                                 <h4>Lesson Parameters and Cookies</h4>
@@ -218,8 +219,8 @@
                             <div class="col-md-12">
                                 <h4>Lesson Plan</h4>
                                 <div class="panel" >
-                                    <div class="panel-body" id="lesson_plan">	
-
+                                    <div class="panel-body" id="lesson_plan">
+					<!-- allowing jQuery to handle this one -->
                                     </div>                                    
                                 </div>
                             </div>
@@ -227,8 +228,8 @@
                         <div class="row lessonHelp" id="lesson_solution_row">
                             <div class="col-md-12">
                                 <h4>Lesson Solution</h4>
-                                <div class="panel" >
-                                    <div class="panel-body" id="lesson_solution">				
+                                <div class="panel">
+                                    <div class="panel-body" id="lesson_solution">
                                     </div>                                    
                                 </div>
                             </div>
@@ -236,8 +237,9 @@
                         <div class="row lessonHelp" id="lesson_source_row">
                             <div class="col-md-12">
                                 <h4>Lesson Source Code</h4>
-                                <div class="panel" >
-                                    <div class="panel-body" id="lesson_source">	                                        
+                                <div class="panel">
+                                    <div class="panel-body" id="lesson_source">
+					<pre>{{source}}</pre>
                                     </div>                                    
                                 </div>
                             </div>
@@ -260,17 +262,10 @@
                                                     var DEBUG_FORM_SUBMISSION = false;
 
                                                     $(document).ready(function() {
-                                                        // bind to click events on menu links
-                                                        /*$('.menu-link').bind('click', function(event) {
-                                                         event.preventDefault();
-                                                         $.get(this.href, {}, function(reply) {
-                                                         $("#lesson_content").html(reply);
-                                                         goat.utils.showLessonSource();
-                                                         }, "html");
-                                                         });*/
-
                                                         app.init();
-
+							//can be augmented later to 'resume' for a given user ... currently kluged to start at fixed lesson
+							var url = 'attack?Screen=32&menu=5';
+							angular.element($('#leftside-navigation')).scope().renderLesson(url);
                                                     });
                                                     // make all forms ajax forms
                                                     var options = {
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css
index 714cf0325..aa8eb698e 100644
--- a/src/main/webapp/css/main.css
+++ b/src/main/webapp/css/main.css
@@ -250,7 +250,7 @@ img {
 }
 
 .main-content-wrapper #main-content {
-  background: url('img/webBg.png') no-repeat top left;
+  /*background: url('img/webBg.png') no-repeat top left;*/
   border-top: solid thin #e7e8ec;
   display: inline-block;
   padding: 15px 15px 0 15px;
@@ -782,10 +782,6 @@ fieldset[disabled] .btn-warning.active {
   display: none;
 }
 
-#hintsView, #cookiesAndParamsView {
-  display:none;
-}
-
 .table-nonfluid {
   width:auto;
 }
@@ -796,6 +792,11 @@ fieldset[disabled] .btn-warning.active {
   font-size: x-small;
 }
 
+/* HINTS */
+#hintsViewTop{
+  display: none;
+  background-color: #eee;
+}
 .info {
 	color:#e84c3d;
 	font-weight: bold; 
diff --git a/src/main/webapp/js/goatConstants.js b/src/main/webapp/js/goatConstants.js
index 03f2e78b9..bc1e5ed9a 100644
--- a/src/main/webapp/js/goatConstants.js
+++ b/src/main/webapp/js/goatConstants.js
@@ -20,7 +20,9 @@ var goatConstants = {
 	lessonPlanService:'service/lessonplan.mvc',
 	menuService: 'service/lessonmenu.mvc',
 	// literals
-	notFound: 'Could not find'
+	notFound: 'Could not find',
+	noHints: 'There are no hints defined.'
+	
 };
 
 
diff --git a/src/main/webapp/js/goatControllers.js b/src/main/webapp/js/goatControllers.js
index a68ebd0b0..e29d16e09 100644
--- a/src/main/webapp/js/goatControllers.js
+++ b/src/main/webapp/js/goatControllers.js
@@ -3,42 +3,152 @@
 
 /* ### GOAT CONTROLLERS ### */
 
-/** Menu Controller
+/** Lesson Controller (includes menu stuff)
  *  prepares and updates menu topic items for the view
  */
-goat.controller('goatLessonMenu', function($scope, $http, $modal, $log, $templateCache) {
+goat.controller('goatLesson', function($scope, $http, $modal, $log, $templateCache) {
+    $scope.cookies= [];
+    $scope.params=[];
     //TODO: implement via separate promise and use config for menu (goat.data.loadMenuData())
     $http({method: 'GET', url: goatConstants.lessonService}).then(
-            function(menuData) {
-                var menuItems = goat.utils.addMenuClasses(goatConstants.menuPrefix.concat(menuData.data));
-                $scope.menuTopics = menuItems;
-            },
-            function(error) {
-                // TODO - handle this some way other than an alert
-                console.error("Error rendering menu: " + error);
-            }
+	function(menuData) {
+	    var menuItems = goat.utils.addMenuClasses(goatConstants.menuPrefix.concat(menuData.data));
+	    $scope.menuTopics = menuItems;
+	},
+	function(error) {
+	    // TODO - handle this some way other than an alert
+	    console.error("Error rendering menu: " + error);
+	}    
     );
+    
     $scope.renderLesson = function(url) {
         //console.log(url + ' was passed in');
         // use jquery to render lesson content to div
+	$scope.hintIndex = 0;
+	
+	var curScope = $scope;
+	
+	
+	curScope.parameters = goat.utils.scrapeParams(url);
         goat.data.loadLessonContent(url).then(
-                function(reply) {
-                    $("#lesson_content").html(reply);
-                    // hook forms
-                    goat.utils.makeFormsAjax();
+		function(reply) {
+		    $("#lesson_content").html(reply);
+		    //hook forms
+		    goat.utils.makeFormsAjax();
+		    $('#hintsView').hide();
 		    //render lesson title
-                    $('#lessonTitle').text(goat.utils.extractLessonTitle($(reply)));
-                    // adjust menu to lessonContent size if necssary
+		    $('#lessonTitle').text(goat.utils.extractLessonTitle($(reply)));
+		    //@KLUGE to remove h1 after extracting and moving it to top
+		    $('#lesson_content h1').remove()
+		    // adjust menu to lessonContent size if necssary
 		    //@TODO: this is still clunky ... needs some TLC
-                    if ($('div.panel-body').height() > 400) {
-                        $('#leftside-navigation').height($(window).height());
-                    }
-		    goat.lesson.lessonInfo = new goat.lesson.CurLesson(url);
-		    goat.lesson.lessonInfo.loadInfo(); //uses pseudo and actual service calls
-		    // @TODO: convert to real services (and more angularjs, likely ... in phase 2)
-                }
+		    if ($('div.panel-body').height() > 400) {
+			$('#leftside-navigation').height($(window).height());
+		    }
+		    //cookies
+		    goat.data.loadCookies().then(
+			function(resp) {
+			    curScope.cookies = resp;
+			}
+		    );
+		    //hints
+		    curScope.hintIndex=0;
+		    goat.data.loadHints().then(
+			function (resp) {
+			    curScope.hints = resp;
+			    if (curScope.hints.length > 0 && curScope.hints[0].hint.indexOf(goatConstants.noHints) === -1) {
+				goat.utils.displayButton('showHintsBtn',true);
+                            } else {
+                                goat.utils.displayButton('showHintsBtn',false);
+                            }
+			}
+		    );
+		    //source
+		    goat.data.loadSource().then(
+			function(resp) {
+			    curScope.source = resp;
+			}
+		    );
+		    //plan
+		    goat.data.loadPlan().then(
+			function(resp) {
+			    curScope.plan = resp;
+			}
+		    );
+		    //solution
+		    goat.data.loadSolution().then(
+			function(resp) {
+			    curScope.solution = resp;
+			}
+		    );
+		    goat.utils.scrollToTop();
+		}
 	    );
-	};
+    };
+    
+    $scope.showLessonSource = function () {
+	$('.lessonHelp').hide();
+        $('#lesson_source_row').show();
+        goat.utils.scrollToHelp();
+    }
+    
+    $scope.showLessonPlan = function () {
+	$('.lessonHelp').hide();
+	$("#lesson_plan").html($scope.plan);
+        $('#lesson_plan_row').show();
+        goat.utils.scrollToHelp();
+    }
+
+    $scope.showLessonSolution = function () {
+	$('.lessonHelp').hide();
+	$("#lesson_solution").html($scope.solution);
+        $('#lesson_solution_row').show();
+        goat.utils.scrollToHelp();
+    }
+
+    $scope.manageHintButtons = function () {
+	if ($scope.hintIndex === $scope.hints.length -1) {
+	    $('#showNextHintBtn').css('visibility','hidden');
+	} else if ($scope.hintIndex < $scope.hints.length - 1) {
+	    $('#showNextHintBtn').css('visibility','visible');
+	}
+	//
+	if ($scope.hintIndex === 0) {
+	    $('#showPrevHintBtn').css('visibility','hidden');
+	} else if ($scope.hintIndex > 0) {
+	    $('#showPrevHintBtn').css('visibility','visible');
+	}
+    };
+    
+    $scope.viewHints = function() {
+	if (!$scope.hints) {
+	    return;
+	}
+	
+	$('.lessonHelp').hide();
+        $('#lesson_hint_row').show();
+        goat.utils.scrollToHelp();
+	$scope.curHint = $scope.hints[$scope.hintIndex].hint;
+	$scope.manageHintButtons();
+    };
+    
+    $scope.viewNextHint = function() {
+	$scope.hintIndex++;
+	$scope.curHint = $scope.hints[$scope.hintIndex].hint;
+	$scope.manageHintButtons();
+    };
+    
+    $scope.viewPrevHint = function () {
+	$scope.hintIndex--;
+	$scope.curHint = $scope.hints[$scope.hintIndex].hint;
+	$scope.manageHintButtons();
+    };
+    
+    $scope.hideHints = function () {
+	
+    };
+    
+    
     }).animation('.slideDown', function() {
 	var NgHideClassName = 'ng-hide';
 	return {
@@ -53,53 +163,6 @@ goat.controller('goatLessonMenu', function($scope, $http, $modal, $log, $templat
 		}
 	    }
 	};
+	
+	
     });
-
-goat.controller('lessonHelpController', function($scope) {
-    $scope.cookies=[];
-    $scope.params=[];
-    $scope.viewCookiesAndParams = function() {
-	    $('#hintsView').hide();
-	    if (goat.lesson.lessonInfo.cookies && goat.lesson.lessonInfo.cookies.length > 0) {
-		$scope.cookies=goat.lesson.lessonInfo.cookies;
-		console.log($scope.cookies);
-		$scope.params=goat.lesson.lessonInfo.params;
-	    }
-	    $('#cookiesAndParamsView').show();
-	//@TODO: issue callback to track view
-    };
-    //$scope.watch()
-});
-
-/*
- *DEPRECATED
-//Controllers for modal instances 
-var showSourceController = function($scope, $modalInstance, lessonSource) {
-
-    $scope.lessonSource = lessonSource;
-
-    $scope.ok = function() {
-        $modalInstance.close();
-    };
-
-    $scope.cancel = function() {
-        $modalInstance.dismiss('cancel');
-    };
-};
-
-var showSolutionController = function($scope, $modalInstance, lessonSolutionUrl) {
-
-    $scope.lessonSolutionUrl = lessonSolutionUrl;
-
-    $scope.ok = function() {
-        $modalInstance.close();
-    };
-
-    $scope.cancel = function() {
-        $modalInstance.dismiss('cancel');
-    };
-};
-*/
-
-
-
diff --git a/src/main/webapp/js/goatLesson.js b/src/main/webapp/js/goatLesson.js
index e84a0b2f5..904712b6a 100644
--- a/src/main/webapp/js/goatLesson.js
+++ b/src/main/webapp/js/goatLesson.js
@@ -31,7 +31,7 @@ goat.lesson = {
                 goat.data.loadHints().then(
                     function(resp) {
                         scope.hints = resp;
-                        if (scope.hints.length > 0) {
+                        if (scope.hints.length > 0 && scope.hints[0].hint.indexOf(goatConstants.noHints) === -1) {
                             goat.utils.displayButton('showHintsBtn',true);
                         } else {
                             goat.utils.displayButton('showHintsBtn',false);
@@ -103,7 +103,7 @@ goat.lesson = {
                 );
             },
             getParams: function() {
-                this.params = goat.utils.scrapeParams(this.lessonUrl)
+                this.params = goat.utils.scrapeParams(this.lessonUrl);
             }
         }
     }
diff --git a/src/main/webapp/js/goatUtil.js b/src/main/webapp/js/goatUtil.js
index c078a5e9a..d291dea8d 100644
--- a/src/main/webapp/js/goatUtil.js
+++ b/src/main/webapp/js/goatUtil.js
@@ -21,6 +21,7 @@ goat.utils = {
      */
     extractLessonTitle: function(el) {
         var title = $('h1', el).text();
+        // remove title
         return title;
     },
     displayButton: function(id,show) {
@@ -44,7 +45,7 @@ goat.utils = {
     },
     showLessonSource: function(source) {
         $('.lessonHelp').hide();
-        $('#lesson_source').html("<pre>"+goat.lesson.lessonInfo.source+"</pre>");
+        //$('#lesson_source').html("<pre>"+goat.lesson.lessonInfo.source+"</pre>");
         $('#lesson_source_row').show();
         goat.utils.scrollToHelp();
     },
@@ -65,6 +66,7 @@ goat.utils = {
         goat.utils.scrollEasy(target);
     },
     scrollToTop: function() {
+        $('.lessonHelp').hide();
         var target= $('#container');
         goat.utils.scrollEasy(target);
     },
