Merge "refactor drawing to support layers"