diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 9d9891c3960..fbecd2b9f2a 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -355,5 +355,7 @@
     -fx-border-radius: 2;
     -fx-background-radius: 2;
     -fx-font-size: 11;
+    -fx-wrap-text: true;
+    -fx-max-width: 300;
 }
 
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index 1c14e09ed4c..5abc01496d8 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -25,11 +25,11 @@
             <Region fx:constant="USE_PREF_SIZE" />
           </minWidth>
         </Label>
-        <Label fx:id="name" text="\$first" styleClass="cell_big_label" />
+        <Label fx:id="name" text="\$first" styleClass="cell_big_label" wrapText="true"/>
       </HBox>
-      <FlowPane fx:id="tasks" />
+      <FlowPane fx:id="tasks"/>
       <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
-      <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
+      <Label fx:id="address" styleClass="cell_small_label" text="\$address" wrapText="true"/>
       <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
     </VBox>
   </GridPane>
diff --git a/src/main/resources/view/TaskListCard.fxml b/src/main/resources/view/TaskListCard.fxml
index 97bd0a3f107..b78e854faaa 100644
--- a/src/main/resources/view/TaskListCard.fxml
+++ b/src/main/resources/view/TaskListCard.fxml
@@ -20,8 +20,8 @@
             </padding>
          <GridPane>
             <columnConstraints>
-               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+               <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" />
+               <ColumnConstraints hgrow="SOMETIMES" minWidth="65.0" />
             </columnConstraints>
             <rowConstraints>
                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
@@ -35,11 +35,7 @@
                                  <Region fx:constant="USE_PREF_SIZE" />
                              </minWidth>
                          </Label>
-                     <Label fx:id="name" styleClass="cell_big_label" text="\$name">
-                        <minWidth>
-                           <Region fx:constant="USE_PREF_SIZE" />
-                        </minWidth>
-                     </Label>
+                     <Label fx:id="name" styleClass="cell_big_label" text="\$name" wrapText="true"/>
                   </children>
                </HBox>
                    <Label fx:id="status" alignment="TOP_CENTER" contentDisplay="RIGHT" styleClass="cell_big_label" text="\$status" textAlignment="RIGHT" GridPane.columnIndex="1" GridPane.halignment="RIGHT" />
@@ -49,7 +45,7 @@
             </VBox.margin>
          </GridPane>
         <Label fx:id="priority" styleClass="cell_medium_label" text="\$priority" />
-            <Label fx:id="description" styleClass="cell_small_label" text="\$description" />
+            <Label fx:id="description" styleClass="cell_small_label" text="\$description" wrapText="true"/>
             <Label fx:id="deadline" styleClass="cell_small_label" text="\$deadline" />
         </VBox>
       <rowConstraints>