Refactored editor, improved painting with fill and line techniques