restructure
added enable/disable shortcut