Reduced duplicated component editing templates by using a flag in the template instead
Removed unused template