Merge "Button style changes"