Further work on admin front-end