Simplify Grid/List View

Changes from GBurton Master