Main popup buitified, more bundles added, double login popup fixed