Fixed some issues with buttons styles