CC-5789 : Builder Cleanup

fixing up context menu