Fixing Localization Issues

Fixing Localization Issues involving loading on server