NVTY-3  Move Context menus to be generic