Minor improvements to UI. Tree #s still wonky.