Merge pull request #19 from johns996/master

master sync
fix for long sidebar titles causing the menu icon to drop below the sidebar box
fixed conflicts