a bit better HTML (and ugly css)
Merge remote-tracking branch 'github/master'