Clean ups

Grid View List View