Fixes to HTML and CSS
Merge branch 'sidebars' into gh-pages

Conflicts:
	index.html
	style/basic.css