tweaked display to remove horizontal scroll
merge display tweak
Merge branch 'master' display tweak

Conflicts:
	index.html
merge