Admin pages

along with some changes