Reorganize sidebars for consistency
Fix a bug with popovers on repo page