Initial crack at separating and clarifying user expectations upon drawing or editing stands. For #270
Merge remote-tracking branch 'origin/master' into new_charts