Refactored ContentPage and started to add annotation enum and dynamic, on-demand annotation list building.