reordering things on pages and fixed a type