refactoring
fix locale
fix bug
Merge branch 'feature/correct_main_page-51' into staging