Merging UI changes to fix scrolling