Rethinking the logic in the navbar categories