some new form fields, util updates, layout files moved to own folder