diff --git a/cmd/list.go b/cmd/list.go
index 812b998c48fd3ce96ef454ede9eb8c3db41794e1..40b4cedecfbcd6972de20390f7bc2ba90167e928 100644
--- a/cmd/list.go
+++ b/cmd/list.go
@@ -25,10 +25,13 @@ 		return err
 	}
 
 	wr := tabwriter.NewWriter(os.Stdout, 0, 8, 0, '\t', 0)
+
+	fmt.Println("Templates")
 	for _, t := range reg.Templates {
-		if _, err := fmt.Fprintf(wr, "%s\t%s@%s\t%s\n", t.Name, t.Repository, t.Branch, t.Created); err != nil {
+		if _, err := fmt.Fprintf(wr, "%s\t%s@%s\t%s", t.Name, t.Repository, t.Branch, t.Created); err != nil {
 			return err
 		}
 	}
-	return wr.Flush()
+	fmt.Println()
+	return nil
 }
diff --git a/cmd/source.go b/cmd/source.go
index efb532f20b16306aac62b05616a3cde0343f1d19..ac525338466790c77e2adad8fbab7d4e1a43c986 100644
--- a/cmd/source.go
+++ b/cmd/source.go
@@ -55,12 +55,15 @@ 		return err
 	}
 
 	wr := tabwriter.NewWriter(os.Stdout, 0, 8, 0, '\t', 0)
+
+	fmt.Println("Sources")
 	for _, s := range reg.Sources {
-		if _, err := fmt.Fprintf(wr, "%s\t%s\n", s.Name, s.URL); err != nil {
+		if _, err := fmt.Fprintf(wr, "%s\t%s", s.Name, s.URL); err != nil {
 			return err
 		}
 	}
-	return wr.Flush()
+	fmt.Println()
+	return nil
 }
 
 func runSourceAdd(ctx *cli.Context) error {