Changes on Templates Panel