diff --git a/public/js/admin.js b/public/js/admin.js
index 4225d2a32..d1c1aaf73 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -26,7 +26,7 @@ ravadaApp.directive("solShowMachine", swMach)
         return {
             require: 'ngModel',
             link: function(scope, elm, attrs, ctrl) {
-                ctrl.$parsers.unshift(function(inputText) {
+                function validateIP(inputText, isParser) {
                     var ipformat = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([0-9]|[0-1][0-9]|2[0-4])$/;
                     if(ipformat.test(inputText))
                     {
@@ -38,10 +38,17 @@ ravadaApp.directive("solShowMachine", swMach)
                         //alert("You have entered an invalid IP address!");
                         //document.form1.text1.focus();
                         ctrl.$setValidity('ipformat', false);
-                        return undefined;
+                        return isParser ? undefined : inputText;
                     }
+                }
+
+                ctrl.$parsers.unshift(function(value) {
+                    return validateIP(value, true);
                 });
 
+                ctrl.$formatters.unshift(function(value) {
+                    return validateIP(value, false);
+                });
             }
         };
     });
diff --git a/templates/main/admin_group.html.ep b/templates/main/admin_group.html.ep
index 2e29edc3d..1c6c485fd 100644
--- a/templates/main/admin_group.html.ep
+++ b/templates/main/admin_group.html.ep
@@ -11,6 +11,8 @@
             <div class="page-header">
               <div class="card" id="admin-content">
                 <div class="card-header">
+                    <div class="row">
+                    <div class="col-10">
                     <h2 class="display-5"><%=l 'Group' %> <%= $group_name %></h2>
 %                  if ($type eq 'ldap') {
 LDAP
@@ -19,6 +21,11 @@ LDAP
                     <br/>
                     <%=l 'dn:' %> <b><%= $group->dn %></b>
 % }
+                    </div>
+                    <div class="col-2" align="right">
+                        <button type="reset" class="btn btn-outline-secondary" onclick = "location='/admin/groups'"><%=l 'back' %></button>
+                    </div>
+                    </div>
                 </div>
               </div>
             </div>
diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep
index 3606e67b6..1ffe417a9 100644
--- a/templates/main/network_options.html.ep
+++ b/templates/main/network_options.html.ep
@@ -128,8 +128,10 @@
 <div class="form-group row">
     <div class="col-md-3" align="right"></div>
     <div class="col-md-4" align="left">
-        <button ng-show="network.id" class="btn btn-outline-secondary"
+        <button type="button" ng-show="network.id" class="btn btn-outline-secondary"
             ng-click="load_network(network.id)"><%=l 'Cancel' %></button>
+        <button type="button" ng-show="!network.id" class="btn btn-outline-secondary"
+            onclick="location='/admin/networks'"><%=l 'Cancel' %></button>
         <button class="btn btn-primary"
             ng-disabled="form_network.$pristine"
             ng-click="update_network()"
diff --git a/templates/main/route_options.html.ep b/templates/main/route_options.html.ep
index 910c7daa5..6ecd00b4c 100644
--- a/templates/main/route_options.html.ep
+++ b/templates/main/route_options.html.ep
@@ -65,9 +65,11 @@
 <div class="row">
     <div class="col-md-3" align="right"></div>
     <div class="col-md-4" align="left">
-        <button ng-show="route.id" class="btn btn-outline-secondary"
+        <button type="button" ng-show="route.id" class="btn btn-outline-secondary"
             ng-disabled="formNetwork.$pristine"
         ng-click="load_network(route.id)"><%=l 'Cancel' %></button>
+        <button type="button" ng-show="!route.id" class="btn btn-outline-secondary"
+        onclick="location='/admin/routes'"><%=l 'Cancel' %></button>
         <button
             class="btn btn-primary"
             ng-click="update_network()"