am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev

* commit '5e1a5e5bad475696e842addceb7dd6a519879f98':
  Create unique files, root ordering, UI bugs.