Added form elements
Fixes