Fix page, move things around