Lots more fixes with offsets from page elements and such
Merge branch 'master' into gh-pages