Small annotation admin fixes
Cleanups and enhancements to annotation UI