diff --git a/app/controllers/main_routes/laborHistory.py b/app/controllers/main_routes/laborHistory.py
index bc916665..6699f59e 100755
--- a/app/controllers/main_routes/laborHistory.py
+++ b/app/controllers/main_routes/laborHistory.py
@@ -131,8 +131,13 @@ def populateModal(statusKey):
         currentUser = require_login()
         if not currentUser:                    # Not logged in
             return render_template('errors/403.html'), 403
-        forms = (FormHistory.select().join(LaborReleaseForm, join_type=JOIN.LEFT_OUTER)
-                            .where(FormHistory.formID == statusKey).order_by(FormHistory.createdDate.desc(), FormHistory.formHistoryID.desc()))
+        forms = (FormHistory.select()
+                            .join(LaborReleaseForm, join_type=JOIN.LEFT_OUTER)
+                            .switch(FormHistory).join(OverloadForm, JOIN.LEFT_OUTER, on=(FormHistory.overloadForm == OverloadForm.overloadFormID))
+                            .switch(OverloadForm).join(User, JOIN.LEFT_OUTER, on=(OverloadForm.laborApprover == User.userID))
+                            .switch(User).join(Supervisor, JOIN.LEFT_OUTER, on=(User.supervisor == Supervisor.ID))
+                            .where(FormHistory.formID == statusKey)
+                            .order_by(FormHistory.createdDate.desc(), FormHistory.formHistoryID.desc()))
         statusForm = LaborStatusForm.get(LaborStatusForm.laborStatusFormID == statusKey)
         currentDate = datetime.today()
         pendingformType = None
diff --git a/app/templates/snips/studentHistoryModal.html b/app/templates/snips/studentHistoryModal.html
index 462f11c0..6a56b4cc 100755
--- a/app/templates/snips/studentHistoryModal.html
+++ b/app/templates/snips/studentHistoryModal.html
@@ -81,6 +81,62 @@
         </div>
       {% endif %}
 
+    {% elif form.overloadForm != None %}
+      {% if form.reviewedDate == None %}
+        <div class="h4 nopadding">
+          <div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
+          <div class="col-sm-5 ">{{form.historyType}}</div>
+          <div class="col-sm-4" align="left">Submitted</div>
+        </div>
+      {% elif form.reviewedDate != None %}
+        <div class="h4 nopadding">
+          <div class="col-sm-3">{{form.reviewedDate.strftime('%m-%d-%Y')}}</div>
+          <div class="col-sm-5 ">{{form.historyType}}</div>
+          <div class="col-sm-4" align="left">{{form.status}}</div>
+        </div>
+        {% if "Denied" in form.status.statusName %}
+        <div class="leftMargin">
+          <div class="row">
+            <p class="col-sm-4 pTag">Reject Reason:</p>
+          <div class="col-sm-7">
+            <textarea class="overloadReasonTextArea" rows="2" cols="45" readonly>{{form.studentOverloadReason}}</textarea>
+          </div>
+          </div>
+        </div>
+        {% endif %}
+        <div class="h4 nopadding">
+          <div class="col-sm-3">{{form.createdDate.strftime('%m-%d-%Y')}}</div>
+          <div class="col-sm-5 ">{{form.historyType}}</div>
+          <div class="col-sm-4" align="left">Submitted</div>
+        </div>
+      {% endif %}
+        <div class="smallDataMargin">
+          <div class="row" style="padding-top:5px">
+            <p class="col-sm-4 releaseTopRows pTag">Labor Office Contact:</p>
+            <div class="col-sm-7" align="left">
+                <p>
+                {% if form.overloadForm.laborApprover_id and (form.overloadForm.laborApprover.supervisor.FIRST_NAME or form.overloadForm.laborApprover.supervisor.LAST_NAME) %}
+                    {{form.overloadForm.laborApprover.supervisor.FIRST_NAME}} {{form.overloadForm.laborApprover.supervisor.LAST_NAME}}
+                {% else %}
+                    None
+                {% endif %}
+                </p> 
+            </div>
+          </div>
+          <div class="row">
+            <p class="col-sm-4 releaseTopRows pTag" align="left">Labor Review Date:</p>
+          <div class="col-sm-7" align="left">
+            <p>{{form.overloadForm.laborReviewDate.strftime('%m-%d-%Y')}}</p>
+          </div>
+          </div> 
+          <div class="row">
+            <p class="col-sm-4 bottomRows pTag">Reason for overload:</p>
+          <div class="col-sm-7" align="left">
+            <textarea class="overloadReasonTextArea" rows="2" cols="45" readonly>{{form.overloadForm.studentOverloadReason}}</textarea>
+          </div>
+          </div>
+        </div>
+
     {% elif form.releaseForm != None %}
       {% if form.reviewedDate == None %}
         <div class="h4 nopadding">