Prelim work on creating a user
Some tidy ups and layout changes on non-admin index.php