Add annotations to the view when they are created

Fix #504