GCP-6335 additions + Changes in add button behaviour