Refactored DrawingView