Issue squash

Yeah, I think that's how it worked before moving everything into edit came along, but then that'd be different to how every other form works.