Merge "button styling"