Refactoring update. Moved all drawing to a single canvas.