change navigation order? not sure