diff --git a/web/channel.go b/web/channel.go
index 2bf5e4a..306b5b7 100644
--- a/web/channel.go
+++ b/web/channel.go
@@ -97,6 +97,8 @@ func (env *Env) getChannel(writer http.ResponseWriter, req *http.Request) {
 		Page:        page,
 		Count:       count,
 		LastUpdated: time.Time{},
+		Source:      "",
+		Channel:     channel,
 	}
 	html.Feed(writer, data)
 }
diff --git a/web/html/feed.html b/web/html/feed.html
index e996dde..4191bac 100644
--- a/web/html/feed.html
+++ b/web/html/feed.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ if .Items }}({{ len .Items }}) {{ end }}Intake{{ end }}
+{{ define "title" }}{{ if .Items }}({{ len .Items }}) {{ end }}{{ if .Source}}{{ .Source }} - {{ else if .Channel }}{{ .Channel }} - {{ end }}Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">
diff --git a/web/html/fetch.html b/web/html/fetch.html
index 0e2417f..9bf4ea7 100644
--- a/web/html/fetch.html
+++ b/web/html/fetch.html
@@ -1,4 +1,4 @@
-{{ define "title" }}Intake - fetch result for {{ .Source }}{{ end }}
+{{ define "title" }}{{ .Source }} fetch result - Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">
diff --git a/web/html/html.go b/web/html/html.go
index fe7fb1e..390d9e4 100644
--- a/web/html/html.go
+++ b/web/html/html.go
@@ -124,6 +124,8 @@ type FeedData struct {
 	Count       int
 	LastUpdated time.Time
 	EditLink    string
+	Source      string
+	Channel     string
 }
 
 func Feed(writer io.Writer, data FeedData) {
diff --git a/web/html/itemPage.html b/web/html/itemPage.html
index 8f4199f..713e3b2 100644
--- a/web/html/itemPage.html
+++ b/web/html/itemPage.html
@@ -1,4 +1,4 @@
-{{ define "title" }}{{ if .Item.Title }}{{ .Item.Title }}{{ else }}{{ .Item.Source }}/{{ .Item.Id }}{{ end }} - Intake [{{ .Item.Source }}]{{ end }}
+{{ define "title" }}{{ if .Item.Title }}{{ .Item.Title }} - {{ .Item.Source }}{{ else }}{{ .Item.Source }}/{{ .Item.Id }}{{ end }} - Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">
diff --git a/web/html/login.html b/web/html/login.html
index 2a682ad..4eccc90 100644
--- a/web/html/login.html
+++ b/web/html/login.html
@@ -1,4 +1,4 @@
-{{ define "title" }}Intake - Login{{ end }}
+{{ define "title" }}Login - Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">
diff --git a/web/source.go b/web/source.go
index 60f3f1f..ba6cb8a 100644
--- a/web/source.go
+++ b/web/source.go
@@ -46,6 +46,8 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) {
 		Count:       count,
 		LastUpdated: lastUpdated,
 		EditLink:    "/source/" + source + "/edit",
+		Source:      source,
+		Channel:     "",
 	}
 	html.Feed(writer, data)
 }