Additional work on the forms section, including some re-organisation