Changed display to labels from web-form