Some changes, trying to get scrolling working