Add close button to menu affinitic refs #5759