Refactor KeyNavigation/handleEvent