Button and Segmented controls have been added