diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index 9ead78b2b..291d1136c 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -3,6 +3,6 @@ PLUGIN_VERSION=		2.0.d
 PLUGIN_DEPENDS=		relayd
 PLUGIN_COMMENT=		Relayd Load Balancer
 PLUGIN_MAINTAINER=		frank.brendel@eurolog.com
-PLUGIN_REVISION=		1
+PLUGIN_REVISION=		2
 
 .include "../../Mk/plugins.mk"
diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
index 71166734a..d876087a1 100644
--- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
+++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
@@ -30,7 +30,7 @@
 
 namespace OPNsense\Relayd\Api;
 
-use \OPNsense\Base\ApiMutableModelControllerBase;
+use \OPNsense\Base\ApiControllerBase;
 use \OPNsense\Core\Config;
 use \OPNsense\Relayd\Relayd;
 use \OPNsense\Base\UIModelGrid;
@@ -39,7 +39,7 @@ use \OPNsense\Base\UIModelGrid;
  * Class SettingsController
  * @package OPNsense\Relayd
  */
-class SettingsController extends ApiMutableModelControllerBase
+class SettingsController extends ApiControllerBase
 {
 
     static protected $internalModelName = 'relayd';
diff --git a/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/status.volt b/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/status.volt
index c406bebe5..9f375cc28 100644
--- a/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/status.volt
+++ b/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/status.volt
@@ -101,10 +101,12 @@ POSSIBILITY OF SUCH DAMAGE.
        if (status.substring(0, 6) === 'active' || status === 'up') {
           statusClass += "btn-success glyphicon-play";
           controlClass += "glyphicon-stop";
+          controlTitle = "Stop this " + nodeType;
           action = 'onclick="toggleNode(\'' + nodeType + '\', ' + id + ', \'disable\')""';
        } else if (status === 'disabled') {
           statusClass += "btn-danger glyphicon-stop";
           controlClass += "glyphicon-play";
+          controlTitle = "Start this " + nodeType;
           action = 'onclick="toggleNode(\'' + nodeType + '\', ' + id + ', \'enable\')"';
        } else {
           statusClass += "btn-danger glyphicon-stop";
@@ -115,8 +117,8 @@ POSSIBILITY OF SUCH DAMAGE.
        if (nodeType === 'relay') {
           action = 'disabled="disabled"';
        }
-       var html = '<span class="' + statusClass + '"> </span>&nbsp;';
-       html += '<span ' + action + ' class="' + controlClass + '"> </span>&nbsp;';
+       var html = '<span class="' + statusClass + '" style="cursor: default;"> </span>&nbsp;';
+       html += '<span ' + action + ' class="' + controlClass + '" title="' + controlTitle + '"> </span>&nbsp;';
        return html;
     };