button and form tweaks