Added simple form elements
Merge conflict resolved