New template and small fixes