Feature #2746: Fix remove buttons in template wizard