Changed some templates rendering