Wrap toggle switch inside a container. Fixes #99
Merge remote-tracking branch 'origin/dev/temp' into dev/temp