improved the layout process for annotations

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>