fixing button layouts