[update] Scrolling and Nav Changes