Scroll bar fix and nav change