Added more labels to the forms