New options to override default button html. A number of small tweaks and fixes.