Fixes to buttonText