Added custom menu to popup and main menu
Updates for Yosemite