updated UI and scrolling flow