fixes; OnOffView is buggy