Reworking navbar categories