Fix of button layouts