Improve button style magic