Fixed handling of Segmented control

Also corrected decimal pad show/hide
fix merge