More label tweaks

Some label tweaks and moving around of a couple of bits to try to make the Edition Edit page a bit clearer and easier.

(Content checked by Sam R).