Fixed some bugs with arrow nav