CLOUD-9 fixed issues on ui