Implement popovers
Merge pull request #4213 from PaulAdamDavis/new-popovers

Implement new popovers