Started refactor of key menu and handler.