fix(misc): some styles & translations
Merge branch 'upgrade' into develop