Reorganised Admin view page