Added tool bar and segmented control