Riderplus: fixed navigation