Index: accounts.php
===================================================================
--- accounts.php	(revision 6d304e1d4b49e43a50fe0bd08637271a8534f651)
+++ accounts.php	(revision 2a7a7c9322896394d9b3aa948e69a2686d63550e)
@@ -15,5 +15,5 @@
 
 	function new_request() { 
-		if !isset ( $_GET['page'] ) || $_GET['page'] == "" ) { ?>
+		if ( !isset ( $_GET['page'] ) || $_GET['page'] == "" ) { ?>
 		
 			<p>Please select a function:</p>
@@ -28,32 +28,136 @@
 			switch ($_GET['page']) {
 				case "admins_by_org":
+					page_admins_by_org();
 					break;
 				case "orgs_by_admin":
+					page_orgs_by_admin();
 					break;
 				case "remove_admin":
+					page_remove_admin();
 					break;
 				case "add_admin":
+					page_add_admin();
 					break;
 				default:
 					break;
 			}
-		} ?>
-		<!--
-		<div class="licenceState" id="divlicenceState">
-			<h2>Licence State for Organisations</h2>
-			<div id="licenceOutput"></div>
-		</div>
+		}
 		
-		<div class="key" style="display:none">
-			<label for="api-key">Your API Key: </label>
-			<input type="password" name="api-key" id="api-key" length="40" />
+		return;
+	}
+
+	
+function page_admins_by_org() {	?>
+		<div class="admins_by_org" id="admins_by_org">
+			<h2>List of Administrators by Organisation</h2>
+			<div id="adminsOutput"></div>
 		</div>
 		
 		<script>
-			get_licence_state();
-		</script>-->
-		<?php
-		return;
-	}
+			get_admins_by_org();
+		</script>
+
+<?php }
+
+function page_orgs_by_admin() {	?>
+		<div class="orgs_by_admin" id="orgs_by_admin">
+			<h2>List of Organisations by Administrator</h2>
+			<div id="adminsOutput"></div>
+		</div>
+		
+		<script>
+			get_orgs_by_admin();
+		</script>
+
+<?php }
+
+function page_remove_admin() {	?>
+		<div class="orgs_by_admin" id="orgs_by_admin">
+			<h2>Delete Administrator</h2>
+			
+			<div class="key">
+				<label for="api-key">Your API Key: </label>
+				<input type="password" name="api-key" id="api-key" length="40" />
+				<input type="button" name="next1" id="next1" value="Next" onclick="get_admins_remove()">
+			</div>
+			
+			<div class="adminsOutput" id="adminsOutput">
+				<!--Dropdown list of Admins -->
+				<!--Next -->
+			</div>
+			
+			<div class="orgsOutput" id="orgsOutput">
+				<!-- Checkboxes for orgs -->
+				<!-- Remove -->
+			</div>
+			
+			
+		</div>
+		
+		<script>
+			
+		</script>
+
+<?php }
+
+function page_add_admin() {	?>
+		
+
+
+		<div class="orgs_by_admin" id="orgs_by_admin">
+			<h2>Add Administrator</h2>
+			<div class="meraki_container">
+				<div class="meraki_row meraki_key">
+					<div class="meraki_left meraki_key">
+							<label for="api-key">Your API Key: </label>
+					</div>
+					<div class="meraki_right meraki_key">
+						<input type="password" name="api-key" id="api-key" length="40" />
+					</div>
+				</div>
+				<div class="meraki_row">
+					<div class="meraki_left">
+						<label for="fullname">Full name: </label>
+					</div>
+					<div class="meraki_right">
+						<input type="text" name="fullname" id="fullname" length="40" />
+					</div>
+				</div>
+				<div class="meraki_row">
+					<div class="meraki_left">
+						<label for="fullname">Email Address: </label>
+					</div>
+					<div class="meraki_right">
+						<input type="text" name="email" id="email" length="40" />
+					</div>
+				</div>
+				<div class="meraki_row">
+					<div class="meraki_left">
+						<label for="fullname">Access Level: </label>
+					</div>
+					<div class="meraki_right">
+						<select name="access"id="access">
+							<option value="full">Full</option>
+							<option value="full">Read-Only</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			
+			<input type="button" name="next1" id="next1" value="Next" onclick="get_orgs_add_admin()">
+			
+			<div class="orgsOutput" id="orgsOutput">
+				<!-- Checkboxes for orgs -->
+				<!-- Add -->
+			</div>
+			
+		</div>
+			
+		<script>
+			
+		</script>
+
+<?php }
+
 
 ?>
Index: include.css
===================================================================
--- include.css	(revision 6d304e1d4b49e43a50fe0bd08637271a8534f651)
+++ include.css	(revision 2a7a7c9322896394d9b3aa948e69a2686d63550e)
@@ -1,13 +1,19 @@
-.container {
-    display: table;
-    }
-.row  {
-    display: table-row;
-    }
-.left, .right, .middle {
-    display: table-cell;
-    padding-right: 25px;
-    }
-.left p, .right p, .middle p {
-    margin: 1px 1px;
-   }
+.meraki_container {
+	display: table;
+	width:1%;
+	text-align: left;
+}
+.meraki_row  {
+	display: table-row;
+	width:1%;
+	text-align: left;
+}
+.meraki_left, .meraki_right, .meraki_middle {
+	display: table-cell;
+	width:1%;
+	white-space:nowrap;
+	padding-right: 25px;
+}
+.meraki_left p, .meraki_right p, .meraki_middle p {
+	margin: 1px 1px;
+}
Index: include.js
===================================================================
--- include.js	(revision 6d304e1d4b49e43a50fe0bd08637271a8534f651)
+++ include.js	(revision 2a7a7c9322896394d9b3aa948e69a2686d63550e)
@@ -6,5 +6,5 @@
 	
 	$("#licenceOutput").append("<p>Fetching organisations...</p>");
-	get_orgs();
+	get_orgs_licences();
 	return;
 	
@@ -75,5 +75,5 @@
 }
 
-function get_orgs_success(data) {
+function get_orgs_licences_success(data) {
 	orgs = data;
 	number_of_orgs = orgs.length;
@@ -82,5 +82,5 @@
 }
 
-function get_orgs() {
+function get_orgs_licences() {
 	var key = $('#api-key').val();
 	//Check if the user has entered anything
@@ -91,5 +91,5 @@
 		dataType: "json",
 		url: "licences.php?action=get_orgs&key=" + key,
-		success: function(data) {get_orgs_success(data);} 
+		success: function(data) {get_orgs_licences_success(data);} 
 	});
 }
Index: include.php
===================================================================
--- include.php	(revision 6d304e1d4b49e43a50fe0bd08637271a8534f651)
+++ include.php	(revision 2a7a7c9322896394d9b3aa948e69a2686d63550e)
@@ -22,4 +22,6 @@
 			case "get_org_licences":
 				echo ( get_org_licences($_GET['orgid'], $key) );
+				break;
+			default:
 				break;
 		}