Tidy up admin and provide quick access to states