Updated template and less