GADGETS-54: changed the UI because of the service definition structure
change.