updated and separated admin views