Language fixes + styling