GCP-5911 initial UI changes