Feature/improve skin

Best regards.