Simplify Grid/List View

Update to current master from gBurton