nicer removal interface
selecting always with circles
Merge branch 'master' into deploy