Positioning and visual fixes