reorganized option types
added Select controls