Refactory toggle display