Scroll into view only if needed
Fix merge issues
UX fixes