significantly cleanup navigation drawer code