UI update plus some scrolling bug fix.