manually merging in pull request from @karnold

fixed bug in firefox
manually merging in pull request from @karnold

bug fix
manually merging in pull request from @karnold

fixed offset in firefox
manually merging in pull request from @karnold

fixed rendering of html assets
manually merging in pull request from @karnold

fix spacing