Closes gh-303
Fixes gh-267
previously the div.control-group and the containing input shared the same id