CLOUD-129 more separated forms on ui