Improve shape positioning