Fix bugs in the toggleable parts
Merge pull request #6 from vkaravir/toggle-fix

Fix bugs in the toggleable parts