Interaction fix

- fixed toggle and some other stuff.