Finish draw toolbar and clean code.