Updated the button layouts