Edit headers and sidebar
Merge remote-tracking branch 'origin/Mitch'