Work on implementing types editor and subtypes editor.
More refactoring and finished types and subtype editor pages.
Merge remote-tracking branch 'origin/master'