Dat magical 3am commit

Most of Administrative view complete - just need Oliver and Tonni's stuff
included, and a small bug fixed.

Navigation is also restored.