Improve contents templates