diff --git a/app/pathfinder.ini b/app/pathfinder.ini
index 1280f952..ff4741cc 100644
--- a/app/pathfinder.ini
+++ b/app/pathfinder.ini
@@ -125,7 +125,7 @@ SEND_RALLY_Mail_ENABLED         =   0
 [PATHFINDER.ROUTE]
 ; max recursive search depth for routes (default: 7000)
 ; decrease it on performance problems
-SEARCH_DEPTH                =   7000
+SEARCH_DEPTH                =   9000
 ; default count of routes that will be checked (initial) when a system is selected (default: 2)
 SEARCH_DEFAULT_COUNT        =   2
 ; max count of routes that can be selected  in "route settings" dialog (default: 4)
diff --git a/js/app/admin.js b/js/app/admin.js
index 29f95f4b..c41ccdd1 100644
--- a/js/app/admin.js
+++ b/js/app/admin.js
@@ -24,6 +24,39 @@ define([
         $('.' + config.triggerOverlayClass).on('click', function(){
             $('.' + config.splashOverlayClass).showSplashOverlay();
         });
+
+        // set fieldset toggled by checkbox ---------------------------------------------------------------------------
+        $('input[type="checkbox"][data-target]').on('change', function(){
+            let targetId = $(this).attr('data-target');
+            if(targetId){
+                let targetElement = $('[data-id="' + targetId + '"]');
+                let targetFormFields = targetElement.find('input[type="radio"]');
+                let checkFormFields = [];
+                for(let formField of targetFormFields) {
+                    if(this.checked){
+                        if(formField.hasAttribute('data-default') || formField.getAttribute('data-default-value')){
+                            checkFormFields.push(formField);
+                        }
+                    }else{
+                        formField.setAttribute('data-default-value', formField.checked ? 'checked' : '');
+                        if(formField.hasAttribute('data-default')){
+                            checkFormFields.push(formField);
+                        }
+                    }
+                }
+
+                for(let checkFormField of checkFormFields) {
+                    checkFormField.checked = true;
+                }
+            }
+        });
+
+        $('input[type="radio"]').on('change', function(){
+            if(this.checked){
+                let targetId = $(this).parents('fieldset').attr('data-id');
+                $('input[type="checkbox"][data-target="' + targetId + '"]').prop('checked', true);
+            }
+        });
     };
 
     /**
diff --git a/public/js/v1.3.3/app/admin.js b/public/js/v1.3.3/app/admin.js
index 29f95f4b..c41ccdd1 100644
--- a/public/js/v1.3.3/app/admin.js
+++ b/public/js/v1.3.3/app/admin.js
@@ -24,6 +24,39 @@ define([
         $('.' + config.triggerOverlayClass).on('click', function(){
             $('.' + config.splashOverlayClass).showSplashOverlay();
         });
+
+        // set fieldset toggled by checkbox ---------------------------------------------------------------------------
+        $('input[type="checkbox"][data-target]').on('change', function(){
+            let targetId = $(this).attr('data-target');
+            if(targetId){
+                let targetElement = $('[data-id="' + targetId + '"]');
+                let targetFormFields = targetElement.find('input[type="radio"]');
+                let checkFormFields = [];
+                for(let formField of targetFormFields) {
+                    if(this.checked){
+                        if(formField.hasAttribute('data-default') || formField.getAttribute('data-default-value')){
+                            checkFormFields.push(formField);
+                        }
+                    }else{
+                        formField.setAttribute('data-default-value', formField.checked ? 'checked' : '');
+                        if(formField.hasAttribute('data-default')){
+                            checkFormFields.push(formField);
+                        }
+                    }
+                }
+
+                for(let checkFormField of checkFormFields) {
+                    checkFormField.checked = true;
+                }
+            }
+        });
+
+        $('input[type="radio"]').on('change', function(){
+            if(this.checked){
+                let targetId = $(this).parents('fieldset').attr('data-id');
+                $('input[type="checkbox"][data-target="' + targetId + '"]').prop('checked', true);
+            }
+        });
     };
 
     /**
diff --git a/public/templates/admin/settings.html b/public/templates/admin/settings.html
index 42792d08..95fa90ca 100644
--- a/public/templates/admin/settings.html
+++ b/public/templates/admin/settings.html
@@ -6,6 +6,9 @@
 
         <div class="row text-center">
             <repeat group="{{ @tplSettings->corporations }}" value="{{ @corporation }}" key="{{@corpName}}" counter="{{ @corpCount }}">
+
+                <set fieldsetId = "{{ 'settings-map-' . @corporation->_id }}" />
+
                 <form role="form" class="form-horizontal" action="/admin/{{ @tplPage}}/save/{{ @corporation->_id }}">
                     <div class="col-sm-12 col-md-6 col-lg-4 pf-landing-pricing-panel">
                         <div class="panel panel-default pricing-big">
@@ -19,7 +22,7 @@
 
                                 <set isManaged = "" />
 
-                                <fieldset class="reverse-order-footer">
+                                <fieldset class="reverse-order-footer" data-id="{{ @fieldsetId}}">
                                     <h4 class="pf-dynamic-area">Map roles</h4>
 
                                     <repeat group="{{ @corporation->getRights() }}" value="{{ @corporationRight }}" >
@@ -37,8 +40,8 @@
                                             <div class="col-sm-12 col-md-6">
                                                 <div class="form-group">
                                                     <div class="col-xs-6 col-sm-12  checkbox checkbox-warning">
-                                                        <input id="form_managed" name="managed" value="1" type="checkbox" {{ @isManaged }}>
-                                                        <label for="form_managed">Managed mode
+                                                        <input id="{{ @fieldsetId}}" name="managed" value="1" type="checkbox" data-target="{{ @fieldsetId}}" {{ @isManaged }}>
+                                                        <label for="{{ @fieldsetId}}">Managed mode
                                                             <i class="fas fa-fw fa-sm fa-question-circle pf-help-light" title="If active only corporation admins can add/update/delete corporation map settings"></i>
                                                         </label>
                                                     </div>
diff --git a/public/templates/modules/role_select_row.html b/public/templates/modules/role_select_row.html
index e4b03d56..c77f62fb 100644
--- a/public/templates/modules/role_select_row.html
+++ b/public/templates/modules/role_select_row.html
@@ -12,6 +12,10 @@
 
     <repeat group="{{ @roles }}" value="{{ @role }}" >
         <set roleType="" />
+        <set default="" />
+        <check if="{{ @role->_id==1 }}">
+            <set default="true" />
+        </check>
         <check if="{{ @role->_id==2 }}">
             <set roleType="radio-danger" />
         </check>
@@ -28,7 +32,7 @@
             <div class="form-group">
                 <div class="col-xs-12">
                     <div class="radio {{ @roleType }}">
-                        <input id="form_role_{{ (int)@@id }}_{{ (int)@right->rightId->_id }}_{{ (int)@role->_id }}" name="rights[{{(int)@right->rightId->_id}}][roleId]" value="{{ (int)@role->_id }}" type="radio" {{ @checked }}>
+                        <input id="form_role_{{ (int)@@id }}_{{ (int)@right->rightId->_id }}_{{ (int)@role->_id }}" name="rights[{{(int)@right->rightId->_id}}][roleId]" value="{{ (int)@role->_id }}" type="radio" <check if="{{ @default }}">data-default</check> {{ @checked }}>
                         <label for="form_role_{{ (int)@@id }}_{{ (int)@right->rightId->_id }}_{{ (int)@role->_id }}">{{ @role->label }}</label >
                     </div>
                 </div>
diff --git a/public/templates/ui/notice.html b/public/templates/ui/notice.html
index 19acbb03..d834d1de 100644
--- a/public/templates/ui/notice.html
+++ b/public/templates/ui/notice.html
@@ -7,11 +7,9 @@
             <div class="panel-body no-padding text-align-center">
                 <div class="price-features" style="min-height: inherit;">
                     <ul class="list-unstyled text-left">
-                        <li><i class="fas fa-fw fa-angle-right"></i>New <em>Discord</em> integration with <em>Webhooks</em> <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/547">#547</a></li>
-                        <li><i class="fas fa-fw fa-angle-right"></i>New feature added for sorting map tabs (drag&drop) <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/571">#571</a></li>
-                        <li><i class="fas fa-fw fa-angle-right"></i>New "map recovery" option added to admin section <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/547">#547</a></li>
-                        <li><i class="fas fa-fw fa-angle-right"></i>Improvements and fixes for ship "mass log" panel <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/560">#560</a></li>
-                        <li><i class="fas fa-fw fa-angle-right"></i>Improved system positions on map. Prevents overlapping. <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/570">#570</a></li>
+                        <li><i class="fas fa-fw fa-angle-right"></i>New "adjustable map height" <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/553">#553</a></li>
+                        <li><i class="fas fa-fw fa-angle-right"></i>New "role management" for corporation managers <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/164">#164</a></li>
+                        <li><i class="fas fa-fw fa-angle-right"></i>Performance tweeks and minor bug fixes.</li>
                         <li><i class="fas fa-fw fa-angle-double-right"></i>Complete <a href="javascript:void(0)" class="pf-navbar-version-info">changelog</a></li>
                     </ul>
                 </div>
diff --git a/public/templates/ui/timeline_element.html b/public/templates/ui/timeline_element.html
index 0207a4fc..5e89d753 100644
--- a/public/templates/ui/timeline_element.html
+++ b/public/templates/ui/timeline_element.html
@@ -4,7 +4,7 @@
         <div class="timeline-heading">
             <h4 class="timeline-title">
                 <a href="{{releaseData.html_url}}" target="_blank">
-                    <i class="fas fa-fw fa-tag"></i>{{ releaseData.name }}
+                    <i class="fas fa-fw fa-tag"></i>&nbsp;{{ releaseData.name }}
                 </a>
 
                 <span class="text-muted pull-right">