HTML-545 - Tweaks to make more widgets work with Simple Form UI