Fixed page ordering, ideas into TODO