Two fixes for usability.

This PR addresses #322 and #314. For #322, I've been able to do it in the UI, so the quick is quite light. Order management will be added later in legend.