UI enhancements
Prevent flickering of annotations