Refactor & optimize KitImport Dialog