Minor refactoring and added an option to disable the keyboard shortcut to the notify icon context menu