Little bit of cleaning up of admin screens