diff --git a/src/data/status_page/model.rs b/src/data/status_page/model.rs
index dc47582..4cd22c0 100644
--- a/src/data/status_page/model.rs
+++ b/src/data/status_page/model.rs
@@ -47,10 +47,6 @@ pub struct StatusPageGroup {
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct StatusPageResponse {
     pub config: StatusPageConfig,
-    #[serde(skip, default)]
-    pub incident: Option<String>,
     #[serde(rename = "publicGroupList")]
     pub public_group_list: Vec<StatusPageGroup>,
-    #[serde(rename = "maintenanceList", skip)]
-    pub maintenance_list: Vec<String>,
 }
diff --git a/src/ui/components/monitor_list.rs b/src/ui/components/monitor_list.rs
index 053b5dc..746b657 100644
--- a/src/ui/components/monitor_list.rs
+++ b/src/ui/components/monitor_list.rs
@@ -38,7 +38,7 @@ fn layout_groups(area: Rect, groups: &[GroupViewState]) -> Vec<Rect> {
     let mut areas = Vec::new();
 
     for group in groups {
-        let group_lines = group.monitors.len() + 1;
+        let group_lines = group.monitors.len() + 2;
         let group_height = (group_lines + line_height).max(1);
         areas.push(Rect {
             x: area.x,
@@ -53,32 +53,6 @@ fn layout_groups(area: Rect, groups: &[GroupViewState]) -> Vec<Rect> {
     areas
 }
 
-//fn layout_groups(area: Rect, group_count: usize) -> Vec<Rect> {
-//    if group_count == 0 {
-//        return vec![];
-//    }
-//
-//    let height_per_group = (area.height as usize / group_count).max(3);
-//    let mut current_y = area.y;
-//    let mut areas = Vec::new();
-//
-//    for _ in 0..group_count {
-//        if current_y + height_per_group as u16 > area.y + area.height {
-//            break;
-//        }
-//
-//        areas.push(Rect {
-//            x: area.x,
-//            y: current_y,
-//            width: area.width,
-//            height: height_per_group as u16,
-//        });
-//
-//        current_y += height_per_group as u16;
-//    }
-//    areas
-//}
-
 fn render_group(frame: &mut Frame, area: Rect, group: &GroupViewState, is_first: bool) {
     let chunks = Layout::default()
         .direction(Direction::Vertical)
diff --git a/src/ui/dashboard/model.rs b/src/ui/dashboard/model.rs
index f25df96..d6af219 100644
--- a/src/ui/dashboard/model.rs
+++ b/src/ui/dashboard/model.rs
@@ -11,7 +11,6 @@ pub enum MonitorStatus {
 
 #[derive(Debug, Clone)]
 pub struct MonitorViewState {
-    pub id: u64,
     pub name: String,
     pub status: MonitorStatus,
     pub response_time: String,
@@ -117,7 +116,6 @@ fn add_monitor_view_state(group: UnifiedGroupData) -> Vec<MonitorViewState> {
             .unwrap_or_else(|| t("unknown").to_string());
 
         monitors.push(MonitorViewState {
-            id: monitor.monitor_info.id,
             name: monitor.monitor_info.name,
             status,
             response_time,