Refactored menu-item glitch fix