Admin view and Room view page fixes