re-added old form controls and updated new form

Yalla