Edit forms

Edit forms and fix some bugs(missing labels)