CLSN-345 Grid - ui issues