Revert "Revert "Updated nav drawer, fixed lifecycle issues""

This reverts commit ffeef935312799ea5f7d187244f3d6017cc9b513.