TFS 13125 - Refactor popups from header to reflect style changes