Builf Fix - now browser remembers last chosen language
Code Refactored