updated button styles
merged