Finalized the new design for managing templates