Added further abstraction to the popovers