Fixed skin template bugs