Adding more validation to UI and marshaller. Updated Rest templates to fix mapping issue