more styleguide cleanup
buttons cleanup cont