resolves some merge conflicts.

Adds vertical and offset bar and ensures they are working correctly.