Fix up annotations. Remove line coloring, add icons. Make annotations reload (after commit).