Layout improvements for annotations & measure