Redoing some navbar category work