updated issue with last navigation current class switch on click/scroll event