Fix for annotation layout