Mockup drawing refactoring.