more layout/markup fixes
Merge branch 'release/v0.0.1' into gh-pages