Updated: Margins and Padding inside of Sidebar
Merge remote-tracking branch 'origin/master'
Receiving Matt's Javascript fix.