Added scroll view and segmented control