Refactoring
Add missing translations
Logic for update rank
fix merge conflict