Better positioning and drawing