phase fix and admin page fixes