Made manage templates fixes