Post 2.2

GridList styling changes, code cleanup and refactoring