Fixed problem with navigation drawer.  Simplified some code.