Fix firefox build
Fix style for Safari
Merge branch 'master' into zoom-bug
Fix to work with only resizing window