fixed positioning
Merge branch 'positioning'