Further refactoring of the share and buy popovers