Restyle buttons, simplify styles further