Add hover, focus, coloring for buttons
merge button conflicts