diff --git a/src/diagnostic/diagnostics.rs b/src/diagnostic/diagnostics.rs
index 81558998e3..417bbbe1a7 100644
--- a/src/diagnostic/diagnostics.rs
+++ b/src/diagnostic/diagnostics.rs
@@ -66,10 +66,12 @@ pub fn print_diagnostics_system(wait: Duration) -> Box<dyn Schedulable> {
                 elasped = 0.0;
                 for diagnostic in diagnostics.iter() {
                     if let Some(value) = diagnostic.value() {
-                        println!("{}: {:.6}", diagnostic.name, value);
+                        print!("{:<10}: {:<9.6}", diagnostic.name, value);
                         if let Some(average) = diagnostic.average() {
-                            println!("  average: {:.6}", average);
+                            print!("  (avg {:.6})", average);
                         }
+
+                        println!("\n");
                     }
                 }
             }