[Finishes 60050428]: click outside popup menus will now dismiss + minor cleanup