fix some positionning problems