Segmented control and UI fixes