diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php
index 3a9eed8d..b1a2f5dc 100644
--- a/src/psm/Module/Server/Controller/ServerController.php
+++ b/src/psm/Module/Server/Controller/ServerController.php
@@ -459,12 +459,10 @@ class ServerController extends AbstractServerController {
                 
 		if (strlen($tpl_data['last_output']) > 255) {
 			$tpl_data['last_output_truncated'] = substr($tpl_data['last_output'], 0, 255) . '...';
-                        $tpl_data['last_output'] = nl2br($tpl_data['last_output']);
 		}
                 
 		if (strlen($tpl_data['last_error_output']) > 255) {
-			$tpl_data['last_error_output_truncated'] = nl2br(substr($tpl_data['last_error_output'], 0, 255) . '...');
-                        $tpl_data['last_error_output'] = nl2br($tpl_data['last_error_output']);
+			$tpl_data['last_error_output_truncated'] = substr($tpl_data['last_error_output'], 0, 255) . '...';
 		}
                 
 		return $this->twig->render('module/server/server/view.tpl.html', $tpl_data);
diff --git a/src/templates/default/module/server/server/view.tpl.html b/src/templates/default/module/server/server/view.tpl.html
index bb253059..1f1cc85d 100644
--- a/src/templates/default/module/server/server/view.tpl.html
+++ b/src/templates/default/module/server/server/view.tpl.html
@@ -335,7 +335,7 @@
 	</div>
 
 	<div class="modal fade" id="modal_last_output" tabindex="-1" role="dialog" aria-labelledby="modal_last_output_label" aria-hidden="true">
-		<div class="modal-dialog" role="document">
+		<div class="modal-dialog" style="width:75%;max-width: 100%" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="modal-title" id="modal_last_output_label">{{ label_last_output }}</h5>
@@ -343,8 +343,8 @@
 						<span aria-hidden="true">&times;</span>
 					</button>
 				</div>
-				<div class="modal-body" style="word-wrap: break-word;">
-					{{ last_output }}
+				<div class="modal-body" style="word-wrap: break-word;font-family: Mono">
+					{{ last_output|nl2br }}
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
@@ -354,7 +354,7 @@
 	</div>
     
 	<div class="modal fade" id="modal_last_error" tabindex="-1" role="dialog" aria-labelledby="modal_last_error_label" aria-hidden="true">
-		<div class="modal-dialog" role="document">
+		<div class="modal-dialog" style="width:75%;max-width: 100%" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="modal-title" id="modal_last_error_label">{{ label_last_error_output }}</h5>
@@ -362,8 +362,8 @@
 						<span aria-hidden="true">&times;</span>
 					</button>
 				</div>
-				<div class="modal-body" style="word-wrap: break-word;">
-					{{ last_error_output }}
+				<div class="modal-body" style="word-wrap: break-word;font-family: Mono">
+					{{ last_error_output|nl2br }}
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>