diff --git a/client/bin/src/main.rs b/client/bin/src/main.rs
index 4f4c1fc..3219f94 100644
--- a/client/bin/src/main.rs
+++ b/client/bin/src/main.rs
@@ -514,10 +514,14 @@ fn main_function(parameter1: String, parameter2: Option<String>) -> ExitCode {
     {
         device_online = check_connection(GlobalConfiguration.lock().unwrap().panelIPAddress.clone());
         if !device_online {
-            println!("{:} not online", &GlobalConfiguration.lock().unwrap().panelIPAddress);
+            println!("PANEL | {:} not online", &GlobalConfiguration.lock().unwrap().panelIPAddress);
             return ExitCode::FAILURE;
         }
     }
+    else
+    {
+        println!("PANEL | No LED Panel used");
+    }
 
     let mut gmc = MQTTCLIENT.lock().unwrap();
     let mqtt_message: Arc<Mutex<Message>> = Arc::new(Mutex::new(Message{ string: None }));
@@ -576,9 +580,9 @@ fn main_function(parameter1: String, parameter2: Option<String>) -> ExitCode {
                     //println!("MQTT | {} - {}", topic, payload_str);
                     let mut lock = mqtt_message_for_callback.lock().unwrap();
                     lock.string = Some(payload_str.to_string());
-                    println!("Received: -> {}", mqttmsg.payload_str());
+                    println!("MQTT | Received: -> {}", mqttmsg.payload_str());
                 } else {
-                    println!("Unsubscribe: connection closed");
+                    println!("MQTT | Unsubscribe: connection closed");
                     break;
                 }
             }
@@ -599,8 +603,8 @@ fn main_function(parameter1: String, parameter2: Option<String>) -> ExitCode {
     
     // Test Webcrawler for public transportataion
     let mut straba_res = straba::fetch_data(Some(true));
-    println!("{:?} {:?}s", straba_res.outbound_station, straba_res.outbound_diff);
-    println!("{:?} {:?}s", straba_res.inbound_station , straba_res.inbound_diff);
+    println!("{0: <20} departure in {1:>4}s", straba_res.outbound_station, straba_res.outbound_diff);
+    println!("{0: <20} departure in {1:>4}s", straba_res.inbound_station , straba_res.inbound_diff);
 
     if GlobalConfiguration.lock().is_ok() && (GlobalConfiguration.lock().unwrap().panelIPAddress.len() > 0)
     {
@@ -640,8 +644,9 @@ fn main_function(parameter1: String, parameter2: Option<String>) -> ExitCode {
             
             // request once a minute new data
             straba_res = straba::fetch_data(None);
-            println!("Update {:?} {:?}s", straba_res.outbound_station, straba_res.outbound_diff);
-            println!("Update {:?} {:?}s", straba_res.inbound_station , straba_res.inbound_diff);
+
+            println!("Update {0: <20} departure in {1:>4}s", straba_res.outbound_station, straba_res.outbound_diff);
+            println!("Update {0: <20} departure in {1:>4}s", straba_res.inbound_station , straba_res.inbound_diff);
         }
 
         let lock = mqtt_message.lock().unwrap();
@@ -666,7 +671,7 @@ fn fun_publishinfoviamqtt(straba_res: &NextDeparture) {
     let station_name: String = format!("{}", straba_res.inbound_station);
     // Execute async publish synchronously
     let _ = publish_message(topic_in_station.as_str(), station_name.as_str());
-    println!("MQTT published {:?} = {:?}s", topic_in_station, straba_res.outbound_station);
+    println!("MQTT | published {:?} = {:?}s", topic_in_station, straba_res.outbound_station);
 }
 
 fn main_function2(ip: String) -> ExitCode