Major update

Changed class-names
Improved the grid