change styling and fix draw retraction