clean up of draw and toolbar