Improved drawing

closes #195