Update template and less code