Rework the new report form text and layout