moved shape positioning in each shape's drawing function