fix scrolling -- simplify