Some changes to the callout view, cleaning.