Merge remote-tracking branch 'origin/develop/nav'

* origin/develop/nav:
  Responsive update