Refactoring of the annotation views, so that components are broken out a bit more. It's still a bit messy, with a hybrid of event handling mechanisms and query selectors, but it's a bit cleaner.