Various finetuning and fixing of URLs and adding more HTML emails