added id attributes to fix form labels