save state
Added arrow navigation