Swipe and scrollview improvements