Positioning bug fixes after Trisha's check