Positioning of right column content
Merge branch 'master' into demo