Added segmented controls