Tree view corrections and speedup -- control mapper is slow to load on PCI, but that will be a future commit to address that.