Better toggling and fixed clearing