IDI-104: Cleaning up the admin interface