Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as
===================================================================
diff -u -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 -rdda2b5711271bed9537af326dbcba4892ddcdc16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as	(.../IndexButton.as)	(revision 5ddfdbac1683d4bf2ecc02de76199e1287cc65e1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as	(.../IndexButton.as)	(revision dda2b5711271bed9537af326dbcba4892ddcdc16)
@@ -39,6 +39,7 @@
 class org.lamsfoundation.lams.monitoring.mv.IndexButton extends MovieClip {
 	
 	public static var _tabID:Number = 2;
+	
 	private var _className = "IndexButton";
 	
 	private var _bgPanel:MovieClip;
@@ -47,6 +48,7 @@
 	private var idxLabel_mc:MovieClip;
 	private var idxLabel:Label;
 	private var _labelText:String;
+	private var _btnType:String; // Go, Previous, Numeric, Next, IndexView
 	
 	private var matchesArr:Array;
 	
@@ -88,7 +90,7 @@
 			Debugger.log(">> clicked", Debugger.GEN, "indexClicked", "IndexButton");
 			mm.drawIndexButtons = false;
 			mm.updateIndexButtons(">>");
-		} else if (buttonText == Dictionary.getValue('mv_search_go_btn_lbl')) { // 'Go' button
+		} else if (_btnType == "Go") { // 'Go' button
 			mm.learnerIndexView.textFieldContents = String(mm.learnerIndexView.getIdxTextField().text); // backup the string incase need to remove textfield
 			if(!isNaN(mm.learnerIndexView.getIdxTextField().text)) { // if the text field contains a number
 				var idx:Number = Number(mm.learnerIndexView.getIdxTextField().text);
@@ -118,7 +120,7 @@
 				}
 			}
 		}
-		else if (buttonText == Dictionary.getValue('mv_search_index_view_btn_lbl')) { // the 'Index View' button
+		else if (_btnType == "IndexView") { // the 'Index View' button
 			mm.drawIndexButtons = true;
 			mm.inSearchView = false;
 			mm.resetSearchTextField = true;
@@ -149,4 +151,8 @@
 	public function get label():Label {
 		return idxLabel;
 	}
+	
+	public function set btnType(_t:String):Void {
+		_btnType = _t;
+	}
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 -rdda2b5711271bed9537af326dbcba4892ddcdc16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 5ddfdbac1683d4bf2ecc02de76199e1287cc65e1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision dda2b5711271bed9537af326dbcba4892ddcdc16)
@@ -161,8 +161,7 @@
 		_currentLearnerIndex = 1;
 		_oldIndex = 1;
 		_numPreferredIndexButtons = 10; // to be displayed at a time
-		//_learnersPerPage = (_root.pb == undefined) ? 10 : _root.pb;
-		_learnersPerPage = 2;
+		_learnersPerPage = (_root.pb == undefined) ? 10 : _root.pb;
 		_firstDisplayedIndexButton = 1;
 		_oldFirstDisplayedIndexButton = 1;
 		Debugger.log("progress batch number: "+_root.pb,Debugger.CRITICAL,"MonitorModel","MonitorModel");
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as
===================================================================
diff -u -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 -rdda2b5711271bed9537af326dbcba4892ddcdc16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(.../LearnerIndexView.as)	(revision 5ddfdbac1683d4bf2ecc02de76199e1287cc65e1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(.../LearnerIndexView.as)	(revision dda2b5711271bed9537af326dbcba4892ddcdc16)
@@ -269,7 +269,8 @@
 		// add back navigation button
 		backBtn = _buttonsPanel_mc.attachMovie("IndexButton", "backBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth-5, _labelText: "<<"});	
 		_indexButton = IndexButton(backBtn);
-		_indexButton.init(mm, undefined);
+		_indexButton.init(mm, undefined);
+		_indexButton.btnType = "Previous";
 		backBtn._x = nextPosition;
 		nextPosition += (btnWidth-5);
 	}
@@ -291,6 +292,7 @@
 					var idxBtn:MovieClip = _buttonsPanel_mc.attachMovie("IndexButton", "idxBtn"+i, _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth, _labelText: String(i)});	
 					_indexButton = IndexButton(idxBtn);
 					_indexButton.init(mm, undefined);
+					_indexButton.btnType = "Numeric";
 					displayedButtons.push(idxBtn);
 					idxBtn._x = nextPosition;
 					nextPosition += btnWidth;
@@ -309,6 +311,7 @@
 		nextBtn = _buttonsPanel_mc.attachMovie("IndexButton", "nextBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth-5, _labelText: ">>"});
 		_indexButton = IndexButton(nextBtn);
 		_indexButton.init(mm, undefined);
+		_indexButton.btnType = "Next";
 		nextBtn._x = nextPosition;
 		nextPosition += (btnWidth-5);
 	}
@@ -347,6 +350,7 @@
 		goBtn = _buttonsPanel_mc.attachMovie("IndexButton", "goBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth, _labelText: Dictionary.getValue('mv_search_go_btn_lbl')});
 		_indexButton = IndexButton(goBtn);
 		_indexButton.init(mm, undefined);
+		_indexButton.btnType = "Go";
 		goBtn._x = nextPosition;
 		nextPosition += (btnWidth);
 	}
@@ -355,6 +359,7 @@
 		indexViewBtn = _buttonsPanel_mc.attachMovie("IndexButton", "indexViewBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: (btnWidth * 2), _labelText: Dictionary.getValue('mv_search_index_view_btn_lbl')});
 		_indexButton = IndexButton(indexViewBtn);
 		_indexButton.init(mm, undefined);
+		_indexButton.btnType = "IndexView";
 		indexViewBtn._x = nextPosition;
 		nextPosition += (btnWidth * 2);
 	}
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 -rdda2b5711271bed9537af326dbcba4892ddcdc16
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 -rdda2b5711271bed9537af326dbcba4892ddcdc16
Binary files differ