Add and remove wrappers when on and off actions are executed.
Made formatting consistent.
Merge pull request #18 from mattg/master

Remove wrappers when menu is deactivated