improve validity of html

remove <form> tag.  this becomes a nested form > form tag.  thereby
breaking keyboard tabbing.  convert form to span to maintain simplicity
of finding elements within their context.