Improve dialog and button widgets