Split annotation form into its own file, and expanded in preparation
for inline formset annotating.
Formatting fix
Alter format of AnnotationForm
Formatting cleanup
Experimenting with structured search