Positioning bugs fixed