minor changes to structure and scrolling in the window.