Added support for edit of control types and bug fixes for skip logic.