Add button styles
merge fix