tweaks to layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/frame21/web/ex.png