diff --git a/assignsubnettolocation.php b/assignsubnettolocation.php
index 29ea59c..362cd1a 100644
--- a/assignsubnettolocation.php
+++ b/assignsubnettolocation.php
@@ -11,7 +11,7 @@
 			
 		mysql_query("INSERT INTO subnetlocation (location_id, subnet_id) VALUE ('$location_id', '$subnet_id')") or die(mysql_error());
 		
-		header("Location: subnet.php");
+		header("Location: subnetview.php?subnet_id=" . $subnet_id);
 	}
 	
 	$subnet_id = $_GET['subnet_id'];
diff --git a/assignvlantosubnet.php b/assignvlantosubnet.php
index 4744d47..0fadbb3 100644
--- a/assignvlantosubnet.php
+++ b/assignvlantosubnet.php
@@ -11,7 +11,7 @@
 			
 		mysql_query("UPDATE subnet SET vlan_id='$vlan_id' WHERE subnet_id='$subnet_id'") or die(mysql_error());
 		
-		header("location: vlan.php");
+		header("location: vlanview.php?vlan_id=" . $vlan_id);
 	}
 	
 	$vlan_id = $_GET['vlan_id'];
@@ -28,7 +28,7 @@
 				<select name="subnet_id">
 				
 <?php
-				$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet ORDER BY subnet_address");
+				$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet ORDER BY INET_ATON(subnet_address)");
 				while ($row = mysql_fetch_object($result)) {
 					echo '<option value="' . $row->subnet_id . '">' . $row->subnet_address . '</option>';
 				}
diff --git a/header.php b/header.php
index 0bb996a..78e5e4a 100644
--- a/header.php
+++ b/header.php
@@ -53,8 +53,14 @@
 				while ($row = mysql_fetch_object($result)) {
 					echo $displayname = $row->displayname . ' - ';
 				}
+				
+// TEMP display only if admin
+if($_SESSION['suser_level'] >= 2) {
+	echo '<a href="nodeadd.php">Add new node</a> - ';
+}
 ?>
 
+
 				<a href="options.php">Options</a> - 
 				<a href="logout.php">Log out</a>
 			</td>
diff --git a/index.php b/index.php
index 36c5aaa..6c918e7 100644
--- a/index.php
+++ b/index.php
@@ -21,7 +21,7 @@
 	<table border="0">
 		<tr>
 			<td>
-				<b>IP Reg <?php echo $config_version; ?></b>
+				<b>IP Reg <?php echo $config_version; ?></b><br>
 			</td>
 		</tr>
 	</table>
diff --git a/location.php b/location.php
index 314e587..169b828 100644
--- a/location.php
+++ b/location.php
@@ -4,7 +4,7 @@
 	function display_subnet ($location_id) {
 		$subnet = '';
 		
-		$result = mysql_query("SELECT s.subnet_id, s.subnet_address, s.subnet_mask FROM subnet s INNER JOIN subnetlocation sl ON s.subnet_id=sl.subnet_id WHERE sl.location_id='$location_id' ORDER BY subnet_address");
+		$result = mysql_query("SELECT s.subnet_id, s.subnet_address, s.subnet_mask FROM subnet s INNER JOIN subnetlocation sl ON s.subnet_id=sl.subnet_id WHERE sl.location_id='$location_id' ORDER BY INET_ATON(subnet_address)");
 		while ($row = mysql_fetch_object($result)) {
 			$subnet .= '<a href="subnetview.php?subnet_id='. $row->subnet_id . '">' . $row->subnet_address . '/' . $row->subnet_mask . '</a><br>';
 		}
diff --git a/search.php b/search.php
index b64da98..f6ac3a4 100644
--- a/search.php
+++ b/search.php
@@ -75,7 +75,7 @@
 	}
 	
 	// look for subnet
-	$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet WHERE subnet_address LIKE '$needle' OR subnet_info LIKE '%$needle%' ORDER BY subnet_address");
+	$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet WHERE subnet_address LIKE '$needle' OR subnet_info LIKE '%$needle%' ORDER BY INET_ATON(subnet_address)");
 	if (mysql_num_rows($result)>0) {
 		echo '<tr><td><b>Subnet(s):</b></td></tr>';
 	}
diff --git a/subnetedit.php b/subnetedit.php
index 5a12ef6..b64609d 100644
--- a/subnetedit.php
+++ b/subnetedit.php
@@ -58,7 +58,7 @@
 				VLAN
 			</td>
 			<td>
-				<select name="vlan_number">
+				<select name="vlan_id">
 				<option value="0">(none)</option>
 
 <?php
diff --git a/vlanview.php b/vlanview.php
index b1e71bd..6d4bd8b 100644
--- a/vlanview.php
+++ b/vlanview.php
@@ -45,7 +45,7 @@
 			<td>
 <?php	
 				// get subnet info
-				$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet WHERE vlan_id='$vlan_id' ORDER BY subnet_address");
+				$result = mysql_query("SELECT subnet_id, subnet_address FROM subnet WHERE vlan_id='$vlan_id' ORDER BY INET_ATON(subnet_address)");
 				while ($row = mysql_fetch_object($result)) {
 					echo '<a href="subnetview.php?subnet_id=' . $row->subnet_id . '">' . $row->subnet_address . '</a><br>';
 				}