Re-designed button layout.