Admin pages update in place
Ready for review
Merge branch 'pages' into development