Fixing video issues for mobile
Merge branch 'master' of https://github.com/nicholasjgreen/wip