Added offset classes
Merge conflicts

- Column fix for 3 columns