Refactor Drawing Layer