Some UI changes when handling imports
Merge branch 'master' of https://github.com/andreascmj/command-line-test