fix annotation, annotation-new layouts