diff --git a/web/index.html b/web/index.html
index bbd069d..a04e1e1 100644
--- a/web/index.html
+++ b/web/index.html
@@ -28,12 +28,24 @@ iframe {
   height: 100%;
   width: 100%;
 }
+
+.index {
+  table-layout: fixed;
+  width: 100%;
+}
 .index .from {
-  width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 15em;
 }
 .index .subject {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .index .date {
+  width: 8em;
   white-space: nowrap;
 }
 .footer {
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 451c94a..37fb5d4 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -610,6 +610,7 @@ fn view_thread(thread_set: &ThreadSet) -> Node<Msg> {
     let subject = first_subject(&thread_node).unwrap_or("<No subject>".to_string());
     set_title(&subject);
     div![
+        C!["container"],
         h1![C!["title"], subject],
         view_message(&thread_node),
         a![
@@ -736,7 +737,7 @@ fn view_desktop(model: &Model) -> Node<Msg> {
     };
     div![
         view_header(&model.query, &model.refreshing_state),
-        section![C!["section"], div![C!["container"], content]],
+        section![C!["section"], content],
         view_header(&model.query, &model.refreshing_state),
     ]
 }