finished auth, fixed page ordering