Further work on Admin view