Cleanups and work on import UI.