nav fix, portrait scroll only
Merge branch 'charlie'

* charlie:
  nav fix, portrait scroll only