We were using the same label for two elements, but the label was only assigned to one of them.
Other than simplifying the controller, this'll make it easier to write tests for this code.