Scrolling and keyboard fix