CLOUD-90 fixed validation
CLOUD-80 fixed ui issues