Fix page ordering