Add the Admin pages and re-organize the User pages