Fixed some issues with the scrollview layout