GCP-7560 Fixes for additional comments
GCP-7678 Switch save and cancel buttons