Refactor model fields and displayed elements
Fix model creator updating on change event