Fix templates
Add inline styles for html for PDF
Small fixes