Cleaning up mobile nav bar
Merge branch 'master' into release/rc1-functional-nodraw

* master:
  Cleaning up mobile nav bar