Added button style
fixed merge conflict