3 files changed, 3 insertions, 2 deletions
diff --git a/ogcp/templates/actions/mode.html b/ogcp/templates/actions/mode.html
index 3adce8f..e2e9bcf 100644
--- a/ogcp/templates/actions/mode.html
+++ b/ogcp/templates/actions/mode.html
@@ -1,4 +1,4 @@
-{% extends 'scopes.html' %}
+{% extends 'commands.html' %}
 {% import "bootstrap/wtf.html" as wtf %}
 
 {% block content %}
diff --git a/ogcp/templates/actions/setup.html b/ogcp/templates/actions/setup.html
index f105dd2..0dcd4c7 100644
--- a/ogcp/templates/actions/setup.html
+++ b/ogcp/templates/actions/setup.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'commands.html' %}
 {% import "bootstrap/wtf.html" as wtf %}
 
 {% block content %}
diff --git a/ogcp/templates/macros.html b/ogcp/templates/macros.html
index d9d2997..3bde877 100644
--- a/ogcp/templates/macros.html
+++ b/ogcp/templates/macros.html
@@ -5,6 +5,7 @@
     <li class="list-group-item state--{{ scope['state'] | lower }}">
         <input class="form-check-input" type="checkbox" form="scopesForm"
                value="{{ " ".join(scope["ip"]) }}"
+               {% if scope.get("selected", False) %}checked{% endif %}
                name="{{ scope["name"] }}_{{ scope["id"] }}">
         {{ scope["name"] }}
         {% if "state" in scope %}