Menu fixed
Buttons adapted