Fix arrow navigation +  minor notation