Re-jig the admin screens

Start of the admin screens with a common structure.