Fix annotation placement

Created by: roewenstrunk

Since I couldn't figure out what was happening in #274, I opened another branch with a solution for better positioning of annotations in measures.