[BUG] Fix nav drawer title syncing

Also, cleanup