sidebar edits
Merge branch 'styling'