Upgrade annotator, extensive layout enhancements. Sidebar filter work.