Tidy admin interface (code reviewed)