SwitchButton added, fixed up input in view