Simplified and improved templates

Changed to simple more developped localized templates