added switch control, merged select controls into one file, minor fixes