fixed navigation and scrolling issue