Fix current nav bug/ sidebar nav bugs