Fixed problem in HTML generation
Switched overflow:scroll -> auto
Small tweaks
Aligned title correctly
Layout tweaking
Merge remote-tracking branch 'upstream/master'