Improve viewer display of Annotations

BUG=
R=jmesserly@google.com

Review URL: https://chromiumcodereview.appspot.com//109363006