minor refactoring
adding support for keyboard shortcuts to Win