Updated grid view control controls