Removed all "popovers" and replaced with inline content blocks