correct rebase issue
add classes to form elements