Moved some fields between forms.
Combined the report form with the CippDesign form.