diff --git a/tui/src/filter.rs b/tui/src/filter.rs
index 984d5d68..f2594234 100644
--- a/tui/src/filter.rs
+++ b/tui/src/filter.rs
@@ -95,7 +95,7 @@ impl Filter {
 
         //Create the search bar widget
         let search_bar = Paragraph::new(display_text)
-            .block(Block::default().borders(Borders::ALL).title("Search"))
+            .block(Block::default().borders(Borders::ALL).title(" Search "))
             .style(Style::default().fg(search_color));
 
         //Render the search bar (First chunk of the screen)
diff --git a/tui/src/running_command.rs b/tui/src/running_command.rs
index 89daa755..f2471778 100644
--- a/tui/src/running_command.rs
+++ b/tui/src/running_command.rs
@@ -74,7 +74,7 @@ impl FloatContent for RunningCommand {
 
             title_line.push_span(
                 Span::default()
-                    .content(" press <ENTER> to close this window ")
+                    .content(" Press <ENTER> to close this window ")
                     .style(Style::default()),
             );
 
diff --git a/tui/src/state.rs b/tui/src/state.rs
index 4e398ee7..c1df4fe8 100644
--- a/tui/src/state.rs
+++ b/tui/src/state.rs
@@ -24,7 +24,7 @@ use temp_dir::TempDir;
 
 const MIN_WIDTH: u16 = 77;
 const MIN_HEIGHT: u16 = 19;
-const TITLE: &str = concat!("Linux Toolbox - ", env!("BUILD_DATE"));
+const TITLE: &str = concat!(" Linux Toolbox - ", env!("BUILD_DATE"), " ");
 const ACTIONS_GUIDE: &str = "List of important tasks performed by commands' names:
 
 D  - disk modifications (ex. partitioning) (privileged)
@@ -61,7 +61,7 @@ pub struct AppState {
     selected_commands: Vec<Rc<ListNode>>,
     drawable: bool,
     #[cfg(feature = "tips")]
-    tip: &'static str,
+    tip: String,
 }
 
 pub enum Focus {
@@ -368,17 +368,17 @@ impl AppState {
         };
 
         let title = if self.multi_select {
-            &format!("{} [Multi-Select]", TITLE)
+            &format!("{}[Multi-Select] ", TITLE)
         } else {
             TITLE
         };
 
         #[cfg(feature = "tips")]
-        let bottom_title = Line::from(self.tip.bold().blue()).right_aligned();
+        let bottom_title = Line::from(self.tip.as_str().bold().blue()).right_aligned();
         #[cfg(not(feature = "tips"))]
         let bottom_title = "";
 
-        let task_list_title = Line::from("Important Actions ").right_aligned();
+        let task_list_title = Line::from(" Important Actions ").right_aligned();
 
         // Create the list widget with items
         let list = List::new(items)
@@ -745,13 +745,13 @@ impl AppState {
 const TIPS: &str = include_str!("../cool_tips.txt");
 
 #[cfg(feature = "tips")]
-fn get_random_tip() -> &'static str {
+fn get_random_tip() -> String {
     let tips: Vec<&str> = TIPS.lines().collect();
     if tips.is_empty() {
-        return "";
+        return "".to_string();
     }
 
     let mut rng = rand::thread_rng();
     let random_index = rng.gen_range(0..tips.len());
-    tips[random_index]
+    format!(" {} ", tips[random_index])
 }