Modifications from master branch (committed first here)
OnOffPanel