Fixed nav drawer theme issues