But, aside from my broader thoughts about flow, your suggestion would certainly be less confusing that the current design.
