Fix bugs caused by single element circles
Add big ugly clear button