diff --git a/templates/restapi.php b/templates/restapi.php
index 39743df3..0014fc6d 100644
--- a/templates/restapi.php
+++ b/templates/restapi.php
@@ -17,16 +17,22 @@
             <div class="col">
               <i class="fas fa-puzzle-piece mr-2"></i><?php echo _("RestAPI"); ?>
             </div>
+            <div class="col">
+              <button class="btn btn-light btn-icon-split btn-sm service-status float-right">
+                <span class="icon text-gray-600"><i class="fas fa-circle service-status-<?php echo $serviceStatus ?>"></i></span>
+                <span class="text service-status">raspap-api <?php echo _($serviceStatus) ?></span>
+              </button>
+            </div>
           </div><!-- /.row -->
         </div><!-- /.card-header -->
         <div class="card-body">
         <?php $status->showMessages(); ?>
-          <form role="form" action="restapi_conf" enctype="multipart/form-data" method="POST">
+          <form role="form" action="restapi_conf" method="POST" class="needs-validation" novalidate>
             <?php echo CSRFTokenFieldTag() ?>
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-                <li class="nav-item"><a class="nav-link active" id="settingstab" href="#restapisettings" data-toggle="tab"><?php echo _("Settings"); ?></a></li>
-                <li class="nav-item"><a class="nav-link" id="loggingtab" href="#restapistatus" data-toggle="tab"><?php echo _("Status"); ?></a></li>
+                <li class="nav-item"><a class="nav-link active" id="restapisettingstab" href="#restapisettings" data-toggle="tab"><?php echo _("Settings"); ?></a></li>
+                <li class="nav-item"><a class="nav-link" id="restapistatustab" href="#restapistatus" data-toggle="tab"><?php echo _("Status"); ?></a></li>
             </ul>
 
             <!-- Tab panes -->
diff --git a/templates/restapi/general.php b/templates/restapi/general.php
index e69de29b..41296084 100644
--- a/templates/restapi/general.php
+++ b/templates/restapi/general.php
@@ -0,0 +1,17 @@
+<div class="tab-pane active" id="restapisettings">
+  <h4 class="mt-3"><?php echo ("RestAPI settings") ;?></h4>
+  <div class="row">
+    <div class="form-group col-lg-12 mt-3">
+      <div class="row">
+        <div class="form-group col-md-6" required>
+          <label for="txtapikey"><?php echo _("API Key"); ?></label>
+          <input type="text" id="txtapikey" class="form-control" name="txtapikey" value="<?php echo htmlspecialchars($apiKey, ENT_QUOTES); ?>" required />
+          <div class="invalid-feedback">
+            <?php echo _("Please provide a valid API key."); ?>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div><!-- /.tab-pane | general tab -->
+
diff --git a/templates/restapi/status.php b/templates/restapi/status.php
index e69de29b..4fc87c88 100644
--- a/templates/restapi/status.php
+++ b/templates/restapi/status.php
@@ -0,0 +1,11 @@
+<!-- status tab -->
+<div class="tab-pane fade" id="restapistatus">
+  <h4 class="mt-3 mb-3"><?php echo _("RestAPI status") ;?></h4>
+  <p><?php echo _("Current <code>raspap-restapi.service</code> status is displayed below."); ?></p>
+  <div class="row">
+    <div class="form-group col-md-8 mt-2">
+      <textarea class="logoutput"><?php echo htmlspecialchars($serviceLog, ENT_QUOTES); ?></textarea>
+    </div>
+  </div>
+</div><!-- /.tab-pane -->
+