Merge pull request #472 from ahgittin/master

minor presentation cleanups
fix tests for previous app-tree tidy