UI Fixes and scroll integration