Move grid system settings to grid lib
Add some extra whitespace