Minor sidebar template tweaks.
Merge branch 'char_merge' of github.com:vegitron/yarn into char_merge