Changed side-bar tree
+ fixes - progress
Not enough fixes
Some minor conflicts