Some refractor to drawing.
Added text update.