Using appId in all Firebase URLs

Also a few whitespace fixes