Improved grid some more
Add print classes