(Partially done) reformat the editTreeView page
Fix merged conflicts/fixed small bugs