Arrow navigation fix