templates
more templates
more fixes
Fix controllers
fix delete()