Merged Blakes Changes

- Added popup-links