Cosmetic changes + language persistance