Include templates
Fix element removal bug