fix for sidebar label
fixed conflicts
Merge pull request #21 from johns996/master

commit history sync