Refactoring enaml views
Another refactoring.