Issue1701

issue was due to nested forms not working.  Took out the nested form and added a style class to display second form inline
I don't like that this end tag splits up the `<div>` - it doesn't make sense to me.