Fixed menu-blinkingbug. Merged buttons