Improving translation and displaying CBS data for visitor
Merge branch 'hotfix/0.7.2'