Added form labels and headings