Spotlights

Ongoing updates for spotlights