Changed button layouts