MODE-2093: Redisign grid view-2