Use a connect button instead of an immediate popup.
Fix the favorite icon in Chrome.