Minor fixes & some testing admin page