Fixed annotation indicator, layer display management.