fixed mixed-up references to multiple form inputs, modified markup BEM-style accordingly