VisibilityToggler - changes from code review