Merge "update sidenav, fix typos" into honeycomb