added scrolling, changed file structure