Updated Keyhandler using GoToLink's suggestions