Organization/Fixes on manual annotation screen and annotation renderer.