Tweak button style
Remove dummy buttons