Move entity options to different screen, and by default hide them
Merge pull request #694 from bartcharbon/master

Importer changes: Moved entity options to different screen, and by default hide them