Clean up of admin design