Small fixes + Added Segmented Control