Updated report form markup