More UI changes to import handling
Merge branch 'master' of https://github.com/andreascmj/command-line-test