updated admin views
fixed the conflicts