Resolved Template Issues