Refactored drop down menu and context menu to new menu layout