UI Tweaks

* Better, complete Importer