Improvements to ordering

app/User.php

@@ -237,12 +237,11 @@ class User extends Authenticatable
 
 			$o->level = $level;
 
-			$result->push($o);
-
 			// Include clients of agents
 			$result->push($o->all_clients($level+1));
 		}
 
+		$result->push($this);
 		return $result->flatten();
 	}