Clean admin

Clean up admin for better usability.