Refactor + es_ES translations improvement + minor stetic change