Heavy stylistic modifications to the button class, but no functional changes