Admin view added and other screens modified/finalized