Fix Scrolling & duplicate menu