Scrollview fixes

This is going to necessitate discussion.