added shortcut and menu code