Profile template inprovements