Converting the contact popout to use the new forms

The g5-enhanced-form class was on the top-level div, so the form js was
removing everything inside, even the parts the show/hide script was
looking for. So I moved that lower and switched it to use the new way of
doing forms.