Added segmented controller with button states