Cleaned up admin a little