Change app language functionality
some code refactoring
Change language fixes