diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html
index 1425ead0..66c7a2ea 100644
--- a/src/templates/default/module/server/server/view.tpl.html
+++ b/src/templates/default/module/server/server/view.tpl.html
@@ -233,13 +233,24 @@
 				<li class="list-group-item">
 					<dl class="row">
 						<dt class="col-md-3">{{ label_last_output }}:</dt>
-						<dd class="col-md-9">{{ last_output }}</dd>
+						<dd class="col-md-9">{{ last_output_truncated }}</dd>
+						{% if last_output_truncated != last_output %}
+						<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal_last_output">
+							See complete...
+						</button>
+						{% endif %}
 					</dl>
 				</li>
 				<li class="list-group-item">
 					<dl class="row">
 						<dt class="col-md-3">{{ label_last_error_output }}:</dt>
-						<dd class="col-md-9">{{ last_error_output }}</dd>
+						<dd class="col-md-9">{{ last_error_output_truncated }}</dd>
+						{% if last_error_output_truncated != last_error_output %}
+						<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal_last_error">
+							See complete...
+						</button>
+						{% endif %}
+
 					</dl>
 				</li>
 			</ul>