Improved some templates