connectForm-tab is now 'form' + tidy up