diff --git a/data/interfaces/default/upcoming.html b/data/interfaces/default/upcoming.html
index 5aa8a910..986ed396 100755
--- a/data/interfaces/default/upcoming.html
+++ b/data/interfaces/default/upcoming.html
@@ -59,28 +59,100 @@
Upcoming Issues
+
+
+
+
+
+
+
-
-
- Comic |
- Issue |
- Release Date |
- Status |
-
-
-
- %for upcome in upcoming:
-
- ${upcome['DisplayComicName']} |
- ${upcome['IssueNumber']} |
- ${upcome['IssueDate']} |
- ${upcome['Status']} |
-
- %endfor
-
+ %if upcoming:
+
+
+ Comic |
+ Issue |
+ Release Date |
+ Status |
+
+
+
+ %for upcome in upcoming:
+
+ ${upcome['DisplayComicName']} |
+ ${upcome['IssueNumber']} |
+ ${upcome['IssueDate']} |
+ ${upcome['Status']} |
+
+ %endfor
+
+ %else:
+ no upcoming data to display |
+ %endif
+
+
+
+
+ %if future_nodata_upcoming:
+
+
+ Comic |
+ Issue |
+ Release Date |
+ Status |
+
+
+
+ %for f_nodata in future_nodata_upcoming:
+
+ ${f_nodata['ComicName']} |
+ ${f_nodata['IssueNumber']} |
+ ${f_nodata['IssueDate']} |
+ ${f_nodata['Status']} |
+
+ %endfor
+
+ %else:
+
+ | ${f_upcome['IssueNumber']} |
+ ${f_upcome['IssueDate']} |
+ ${f_upcome['Status']} |
+
+ %endfor
+
+ %else:
+ no upcoming future data to display |
+ %endif
+
+
+
%def>
<%def name="headIncludes()">
@@ -92,6 +164,9 @@