fix scrolling and cleanup