Update to use scrollview layout