Positioning and visual fixes

fixes blocker #2809