Minor grid tweaking
Fix body class handling