|#1490|+Riya| adding and removing from grid at UI level.