Fixing parallax on non-desktops
Merge branch 'dev' into beta