fixed entitlements
added code to switch between menu types - Menu, Window, Popover
code cleanup