Put annotation editing element together in a div.  Also added a button to
cancel the annotation.