diff --git a/src/components/UiItems/DropDown.js b/src/components/UiItems/DropDown.js
index 2ce1841..47f94e8 100644
--- a/src/components/UiItems/DropDown.js
+++ b/src/components/UiItems/DropDown.js
@@ -14,7 +14,7 @@ import Input from "@material-ui/core/Input";
 
 const componentId = (item: UIDropDown) => `dropdown-${item.topic}`;
 
-const DropDownOptions = ({options}) =>
+const DropDownOptions = (options) =>
   map(options, (v, k) => <MenuItem value={k} key={k}>{v}</MenuItem>);
 
 const onChangeEvent = (item: UIDropDown, changeState) =>
@@ -30,7 +30,7 @@ const BaseComponent = ({Icon}, item, state, changeState) => (
         disabled={isDisabled(item, state)}
         input={<Input id={componentId(item)} />}
       >
-        <DropDownOptions options={item.options} />
+        {DropDownOptions(item.options)}
       </Select>
     </FormControl>
   </React.Fragment>
diff --git a/src/components/UiItems/Toggle.js b/src/components/UiItems/Toggle.js
index e7ef1b4..5299c03 100644
--- a/src/components/UiItems/Toggle.js
+++ b/src/components/UiItems/Toggle.js
@@ -14,7 +14,7 @@ const isToggled = (item: UIToggle, state: State) => {
   return checked;
 };
 
-const doToggle = (item: UIToggle, state: State, changeState) => {
+const doToggle = (item: UIToggle, state: State, changeState) => () => {
   if (isEnabled(item, state)) {
     const toggled = isToggled(item, state);
     const on = item.on == null ? "on" : item.on;