This commit closes one of the two issues on which the release depends - it adds the extra textfields and wording in the edit page. There is one more issue open, the sorting by mapped / unmapped and perhaps a checkbox to enable / disable this behaviour.