Updated Nav and scroll