Bug fixes and new scrolling mechanism

Fixed all bugs encountered on Monday, and added new scrolling mechanism