diff --git a/_layouts/workflow.html b/_layouts/workflow.html
index fc1be6bf06d1f6..dce3e843eab3fa 100644
--- a/_layouts/workflow.html
+++ b/_layouts/workflow.html
@@ -149,9 +149,46 @@ <h1 data-toc-skip>{{ workflow.title }}</h1>
 				Download
 			</a>
 			<pre class="mermaid">{{ workflow.mermaid }}</pre>
+			<h2>Inputs</h2>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th>Input</th>
+						<th>Label</th>
+					</tr>
+				</thead>
+				<tbody>
+				{% for input in workflow.inputs %}
+				<tr>
+					<td>{{ input.name }}</td>
+					<td>{{ input.label }}</td>
+				</tr>
+				{% endfor %}
+				</tbody>
+			</table>
 
-			<h2>Tools</h2>
+			<h2>Outputs</h2>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th>From</th>
+						<th>Output</th>
+						<th>Label</th>
+					</tr>
+				</thead>
+				<tbody>
+				{% for output in workflow.outputs %}
+				<tr>
+					<td>{{ output.tool_id }}</td>
+					<td>{{ output.name }}</td>
+					<td>{{ output.label }}</td>
+				</tr>
+				{% endfor %}
+				</tbody>
+			</table>
 
+
+			<h2>Tools</h2>
 			<table class="table table-striped">
 				<thead>
 					<tr>
@@ -176,14 +213,6 @@ <h2>Tools</h2>
 				</tbody>
 			</table>
 
-			<!--
-			<h2>Inputs</h2>
-			Coming Soon™
-
-			<h2>Outputs</h2>
-			Coming Soon™
-			-->
-
 
 			<p>To use these workflows in Galaxy you can either click the links to download the workflows, or you can right-click and copy the link to the workflow which can be used in the Galaxy form to import workflows.</p>
 
diff --git a/_plugins/jekyll-topic-filter.rb b/_plugins/jekyll-topic-filter.rb
index d5ae4029e309b3..cd09ffc351c5ac 100644
--- a/_plugins/jekyll-topic-filter.rb
+++ b/_plugins/jekyll-topic-filter.rb
@@ -698,7 +698,9 @@ def self.resolve_material(site, material)
           'modified' => File.mtime(wf_path),
           'mermaid' => mermaid(wf_json),
           'graph_dot' => graph_dot(wf_json),
-          'workflow_tools' => extract_workflow_tool_list(wf_json).uniq,
+          'workflow_tools' => extract_workflow_tool_list(wf_json).flatten.uniq.sort,
+          'inputs' => wf_json['steps'].select { |_k, v| ['data_input', 'data_collection_input', 'parameter_input'].include? v['type'] }.map{|_, v| v},
+          'outputs' => wf_json['steps'].select { |_k, v| v['workflow_outputs'] && v['workflow_outputs'].length.positive? }.map{|_, v| v},
         }
       end
     end