Fixed video positioning and desktop nav behavior.
Merge branch 'bob-fixes'