#MKL-309 UI form UI changes