I believe the previous HTML was proper, the <label> should wrap the input, as well as the text.