diff --git a/views/report/comparison.tpl b/views/report/comparison.tpl
index 0777e03..3d271d6 100644
--- a/views/report/comparison.tpl
+++ b/views/report/comparison.tpl
@@ -11,7 +11,7 @@
 <tr><td>Term</td>
 {{range .Estimate.Loans}}<td>{{.Term}} Years</td>{{end}}</tr>
 <tr><td>Amortization</td>
-{{range .Estimate.Loans}}<td>{{.Amortization}}</td>{{end}}</tr>
+{{range .Estimate.Loans}}<td>Fixed</td>{{end}}</tr>
 <tr><td>Interest rate</td>
 {{range .Estimate.Loans}}<td>{{.Interest}}%</td>{{end}}</tr>
 <tr><td>Loan payment</td>
diff --git a/views/report/header.tpl b/views/report/header.tpl
index 0fba230..31e89c3 100644
--- a/views/report/header.tpl
+++ b/views/report/header.tpl
@@ -1,7 +1,9 @@
 {{define "header"}}
 <header class="heading">
 
+{{if .Letterhead}}
 <img src="data:image/png;base64,{{.Letterhead}}" />
+{{end}}
 
 <div>
 <div class="user-info">
@@ -13,7 +15,9 @@
 {{.User.Address.City}}, {{.User.Address.Region}} {{.User.Address.Zip}}
 </small>
 </div>
+{{if .Avatar}}
 <img src="data:image/png;base64,{{.Avatar}}" />
+{{end}}
 </div>
 
 </header>