diff --git a/src/Controllers/EditEntityController.java b/src/Controllers/EditEntityController.java
index 5d8b402..b91c153 100644
--- a/src/Controllers/EditEntityController.java
+++ b/src/Controllers/EditEntityController.java
@@ -1,6 +1,5 @@
 package Controllers;
 
-import java.time.LocalDate;
 import java.util.ArrayList;
 
 import DAOs.MajorDAO;
@@ -11,7 +10,6 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.DatePicker;
 import javafx.scene.control.TextField;
 
 public class EditEntityController {
@@ -23,7 +21,7 @@ public class EditEntityController {
     private ComboBox<String> cbMajorID;
 
     @FXML
-    private DatePicker dpExpectedGraduation;
+    private TextField tfExpectedGraduation;
 
     @FXML
     private TextField tfCity;
@@ -37,6 +35,9 @@ public class EditEntityController {
     @FXML
     private TextField tfLastName;
 
+    @FXML
+    private TextField tfPhone;
+
     @FXML
     private TextField tfState;
 
@@ -70,16 +71,18 @@ void search(ActionEvent event) {
             Students student = StudentDAO.getStudentById(tfID.getText());
             if (student != null) {
                 tfStudentID.setText(student.getStudentID());
-                
+
                 tfFirstName.setText(student.getFirstName());
                 tfLastName.setText(student.getLastName());
+                tfPhone.setText(student.getPhone());
                 tfEmail.setText(student.getEmail());
                 tfStreet.setText(student.getStreet());
                 tfCity.setText(student.getCity());
                 tfState.setText(student.getState());
                 tfZipCode.setText(String.valueOf(student.getZipCode()));
-                cbMajorID.setValue(String.valueOf(student.getMajorID() + " - " + MajorDAO.getMajorName(student.getMajorID())));
-                dpExpectedGraduation.setValue(LocalDate.parse(student.getExpectedGraduationDate()));
+                cbMajorID.setValue(
+                        String.valueOf(student.getMajorID() + " - " + MajorDAO.getMajorName(student.getMajorID())));
+                tfExpectedGraduation.setText(student.getExpectedGraduationDate());
             }
         } else {
             Alert alert = new Alert(Alert.AlertType.ERROR);
@@ -103,7 +106,7 @@ private boolean validateFields() {
             alert.showAndWait();
             return false;
         }
-        if (dpExpectedGraduation.getValue() == null) {
+        if (tfExpectedGraduation.getText() == null) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Error");
             alert.setHeaderText("Error");
@@ -143,6 +146,14 @@ private boolean validateFields() {
             alert.showAndWait();
             return false;
         }
+        if (tfPhone.getText().isEmpty()) {
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Error");
+            alert.setHeaderText("Error");
+            alert.setContentText("Please enter a phone number.");
+            alert.showAndWait();
+            return false;
+        }
         if (tfState.getText().isEmpty()) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Error");
@@ -171,5 +182,3 @@ private boolean validateFields() {
     }
 
 }
-
-
diff --git a/src/Views/EditEntityView.fxml b/src/Views/EditEntityView.fxml
index ace757b..c431639 100644
--- a/src/Views/EditEntityView.fxml
+++ b/src/Views/EditEntityView.fxml
@@ -3,7 +3,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
 <?import javafx.scene.control.TextField?>
@@ -127,12 +126,12 @@
                         </VBox>
                         <VBox alignment="CENTER" fillWidth="false" GridPane.columnIndex="1" GridPane.rowIndex="6">
                            <children>
-                              <TextField onAction="#enter" />
+                              <TextField fx:id="tfZipCode" onAction="#enter" />
                            </children>
                         </VBox>
                         <VBox alignment="CENTER" fillWidth="false" GridPane.columnIndex="1" GridPane.rowIndex="7">
                            <children>
-                              <TextField fx:id="tfZipCode" onAction="#enter" />
+                              <TextField fx:id="tfPhone" onAction="#enter" />
                            </children>
                         </VBox>
                         <VBox alignment="CENTER" fillWidth="false" GridPane.columnIndex="1" GridPane.rowIndex="8">
@@ -147,7 +146,7 @@
                         </VBox>
                         <VBox alignment="CENTER" fillWidth="false" GridPane.columnIndex="1" GridPane.rowIndex="10">
                            <children>
-                              <DatePicker fx:id="dpExpectedGraduation" onAction="#enter" />
+                              <TextField fx:id="tfExpectedGraduation" />
                            </children>
                         </VBox>
                         <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" style="-fx-background-color: grey;" GridPane.columnSpan="2" GridPane.rowIndex="11">