Merge "Create unique files, root ordering, UI bugs." into klp-dev