diff --git a/src/views/error_view.rs b/src/views/error_view.rs
index 14711a9..cac0274 100644
--- a/src/views/error_view.rs
+++ b/src/views/error_view.rs
@@ -34,6 +34,15 @@ impl Navigable for ErrorView {
         _: &Peripherals,
     ) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
         async move {
+            outputs
+                .primary_display
+                .clear(Rgb565::BLACK)
+                .unwrap_or_else(|error| {
+                    panic!(
+                        "Error: {error:?}\nDraw error while rendering ErrorView: {}",
+                        self.error
+                    )
+                });
             let style = MonoTextStyle::new(&FONT_10X20, Rgb565::RED);
             let display_area = outputs.primary_display.bounding_box();
             Text::new(
@@ -44,7 +53,7 @@ impl Navigable for ErrorView {
             .draw(&mut outputs.primary_display)
             .unwrap_or_else(|error| {
                 panic!(
-                    "Error: {error:?}\nDraw error while rendering error: {}",
+                    "Error: {error:?}\nDraw error while rendering ErrorView: {}",
                     self.error
                 )
             });
@@ -61,7 +70,7 @@ impl Navigable for ErrorView {
                 .draw(&mut outputs.primary_display)
                 .unwrap_or_else(|error| {
                     panic!(
-                        "Error: {error:?}\nDraw error while rendering error: {}",
+                        "Error: {error:?}\nDraw error while rendering ErrorView: {}",
                         self.error
                     )
                 });
diff --git a/src/views/settings_menu.rs b/src/views/settings_menu.rs
index 47ceee1..c0f3fc9 100644
--- a/src/views/settings_menu.rs
+++ b/src/views/settings_menu.rs
@@ -12,7 +12,7 @@ use embedded_graphics::pixelcolor::Rgb565;
 use embedded_graphics::prelude::RgbColor;
 use embedded_graphics_core::draw_target::DrawTarget;
 
-pub const MAX_SELECTED: i32 = 2;
+pub const MAX_SELECTED: i32 = 3;
 
 #[derive(Debug, Clone)]
 pub struct SettingsMenu {
@@ -27,7 +27,9 @@ impl Navigable for SettingsMenu {
     ) -> impl core::future::Future<Output = Result<(), Box<dyn error::Error>>> + Send {
         async move {
             let display = &mut outputs.primary_display;
-            display.clear(Rgb565::BLACK).unwrap();
+            display
+                .clear(Rgb565::BLACK)
+                .map_err(PrimaryDisplayError::from)?;
             menu_item::show(display, "System Inforation", 0, self.selected)
                 .map_err(PrimaryDisplayError::from)?;
             menu_item::show(display, "Wifi Information", 1, self.selected)