Make info popup a component and fix favorites display