Button & Spotlight Updates