Updated import UI and controller