Dashboard span fix
Language fix
Merge branch 'hotfix/hotfix'