Tweak the hide/show on form submission
Merge branch 'form' into test