Make the admin easier to handle