Bug fixes

Fixed issues with keeping items scrolled into view. Fixed some
flakiness with loss of click events.