Removed all templates on per steps
- moved to tab to minimize ext template call