Added fixes for button styles.