JB removal step 1, animated scrolling, layout updates