fixed scroll
Merge branch 'fixes' to fix scroll in Firefox