Fix the scrolling issue and persist the user to local storage