#14: Add remaining popovers