Added arrow navigation