Fix page navigator