diff --git a/notes.txt b/notes.txt
index 8f075b9..1223052 100755
--- a/notes.txt
+++ b/notes.txt
@@ -55,17 +55,3 @@
 
 	Much of this is defunct. Only the database updates are relevant currently.
 
-
-
-Check the following pages for layout:
-
-	"/register": {
-	"/register/auth": {
-	"/login/auth": {
-	"/lostpwd/tok": {
-	"/setpwd": {
-	"/setpwd/auth": {
-	"/logout": {
-	"/login/tok": {
-	"/login/subtok": {
-	"/mainpage": {
diff --git a/src/bu-command-nav.json b/src/bu-command-nav.json
index f50698b..deccd9b 100644
--- a/src/bu-command-nav.json
+++ b/src/bu-command-nav.json
@@ -37,6 +37,19 @@
 			}
 		},
 
+		"Johnpearcey\\Amara\\Router\\RqHandlerCls_logintok" : {
+			"style":[ "/css/login.css" ],
+			"page_builder" : {
+				"name" : "tok_entry_page",				
+				"data" : {
+					"tok_entry_form" : {
+						"btn_submit_value" : "Send",
+						"css_class_frm" : "frm2col frm_tok"
+					}
+				}
+			}		
+		},
+
 		"Johnpearcey\\Amara\\Router\\RqHandlerCls_lostpwd" : {			
 			"style":[ "/css/login.css" ],
 			"page_builder" : {
@@ -48,8 +61,22 @@
 					}
 				}
 			}
+		},
+
+		"Johnpearcey\\Amara\\Router\\RqHandlerCls_setpwd" : {
+			"style":[ "/css/login.css" ],
+			"page_builder" : {
+				"name" : "newpwd_page",				
+				"data" : {
+					"newpwd_form" : {
+						"btn_submit_value" : "Reset",
+						"css_class_frm" : "frm2col frm_login"
+					}
+				}
+			}
 		}
 
+
 	},
 
 	"Navigate": {
@@ -63,7 +90,11 @@
 		
 		"/mainpage": {
 			"secure":1,
-			"class-handler": "Johnpearcey\\Amara\\Router\\RqHandlerCls_mainpage"
+			"class-handler": "Johnpearcey\\Amara\\Router\\RqHandlerCls_mainpage",
+			"page_builder" : "main_page",
+			"class_props":{
+				"logout_link" : "/logout"
+			}
 		}
 		
 	}		
diff --git a/src/css/login.css b/src/css/login.css
index 38e9dc9..5e7dca8 100644
--- a/src/css/login.css
+++ b/src/css/login.css
@@ -7,8 +7,15 @@
 	padding-left: 20px;
 }
 
-.admin_layout.frm2col {
-	
+.admin_layout input[type=text], .admin_layout input[type=password] {
+	max-width: 300px;
+}
+
+.frm_tail {
+	padding: 15px;
+}
+
+.frm2col {	
 	grid-template-columns: 30% 1fr;
 	grid-template-rows: 25px 25px 1fr;
 	column-gap: 5px;
@@ -21,23 +28,8 @@
 	margin-right: 15px;
 }
 
-.admin_layout.frm2col.frm_login input[type=submit] {
-	grid-column: 2;
-	grid-row: 3;
-	justify-self: start;
-	padding: 3px;
-	min-width: 80px
-}
-
-.admin_layout.frm2col.frm_register input[type=submit] {
-	grid-column: 2;
-	grid-row: 4;
-	justify-self: start;
-	padding: 3px;
-	min-width: 80px
-}
-
-.admin_layout.frm2col.frm_lostpwd input[type=submit] {
+/*Btn placement on 2nd row*/
+.frm2col.frm_lostpwd input[type=submit] {
 	grid-column: 2;
 	grid-row: 2;
 	justify-self: start;
@@ -45,11 +37,21 @@
 	min-width: 80px
 }
 
-
-.admin_layout input[type=text], .admin_layout input[type=password] {
-	max-width: 300px;
+/*Btn placement on 3rd row*/
+.frm2col.frm_login input[type=submit], .frm2col.frm_tok input[type=submit] {
+	grid-column: 2;
+	grid-row: 3;
+	justify-self: start;
+	padding: 3px;
+	min-width: 80px
 }
 
-.frm_tail {
-	padding: 15px;
-}
\ No newline at end of file
+/*Btn placement on 4th row*/
+.frm2col.frm_register input[type=submit] {
+	grid-column: 2;
+	grid-row: 4;
+	justify-self: start;
+	padding: 3px;
+	min-width: 80px
+}
+