BS3 form tweaks