added id attribute to form elements, fixed wrong class name
Merge remote branch 'origin/master'