Improvements to annotations when you change page