Simplify Grid/List view
Merge pull request #6 from gburton/grid_list

Simplify Grid/List view