Reorganised forms.js