Tweak the no-js layout
Merge pull request #2371 from riking/nojs-layout

Tweak the no-js layout