Fixed some naviagation active class bugs