diff --git a/src/FIT/Bundle/ModuleDefaultBundle/Controller/ModuleController.php b/src/FIT/Bundle/ModuleDefaultBundle/Controller/ModuleController.php
index 9aa2256a..9a1dd1a9 100644
--- a/src/FIT/Bundle/ModuleDefaultBundle/Controller/ModuleController.php
+++ b/src/FIT/Bundle/ModuleDefaultBundle/Controller/ModuleController.php
@@ -4,7 +4,6 @@
 
 use FIT\NetopeerBundle\Controller\ModuleControllerInterface;
 use FIT\NetopeerBundle\Models\XMLoperations;
-use FIT\NetopeerBundle\Services\Functionality\ConnectionFunctionality;
 use FIT\NetopeerBundle\Services\Functionality\NetconfFunctionality;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -100,7 +99,6 @@ public function moduleAction($key, $module = null, $subsection = null)
 			$res = array(
 				'variables' => array(
 					'jsonEditable' => true,
-					'datastore' => $conn->getCurrentDatastore(),
 				),
 				'configuration' => $data,
 				'snippets' => $content['snippets'],
diff --git a/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/js/JSONedit.js b/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/js/JSONedit.js
index e0c91747..4ab8a1e0 100644
--- a/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/js/JSONedit.js
+++ b/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/js/JSONedit.js
@@ -309,6 +309,14 @@ var app = angular.module('NetopeerGUIApp', ['JSONedit', 'ngRoute', 'ngTraverse',
 				templateUrl: 'main/view.html',
 				controller: 'ConfigurationController'
 			})
+			.when('/module/:moduleName/:sectionName', {
+				templateUrl: 'main/view.html',
+				controller: 'ConfigurationController'
+			})
+			.when('/rpc/:moduleName/:rpcName', {
+				templateUrl: 'main/view.html',
+				controller: 'ConfigurationController'
+			})
 			.when('/action/:action', {
 				templateUrl: 'main/view.html',
 				controller: 'ConfigurationController'
diff --git a/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/public/templates.js b/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/public/templates.js
index 1398124f..f68b60ec 100644
--- a/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/public/templates.js
+++ b/src/FIT/Bundle/ModuleDefaultBundle/Resources/public/netopeerangular/public/templates.js
@@ -1,6 +1,6 @@
-angular.module("configurationTemplates", []).run(["$templateCache", function($templateCache) {$templateCache.put("directives/addItem.html","<span ng-if=\"showAddKey && jsonEditable\">\n\n	<span ng-show=\"$parent.type !== \'List\' && $parent.type !== \'Array\'\">\n		<input placeholder=\"{{ typeaheadNoResults ? \'No name available\' : \'Type a letter\' }}\" type=\"text\"\n					 class=\"form-control input-sm addItemKeyInput\" ng-model=\"$parent.keyName\" autocomplete=\"off\" uib-typeahead=\"subchild for subchild in getAvailableNodeNames(key, child, $parent)\" typeahead-min-length=\"0\" typeahead-loading=\"loadingResponses\" typeahead-no-results=\"typeaheadNoResults\" typeahead-focus ng-blur=\"changeParentKeyName($parent.keyName, child, $parent);showSelectbox = true\"\n				/>\n	</span>\n\n	<span class=\"editbar\" ng-if=\"child[\'$@\'+$parent.keyName]\">\n		<i class=\"iconButton fa fa-question-circle\" tooltip-placement=\"top\" uib-tooltip=\"{{child[\'$@\'+$parent.keyName][\'description\']}}\" ng-if=\"child[\'$@\'+$parent.keyName][\'description\']\"></i>\n		<i class=\"iconButton fa fa-asterisk red\" tooltip-placement=\"top\" uib-tooltip=\"Mandatory\" ng-if=\"isMandatory($parent.keyName, child)\"></i>\n	</span>\n\n	<select ng-model=\"$parent.valueType\" ng-options=\"option for option in valueTypes\" class=\"form-control input-sm hidden\" ng-show=\"showSelectbox && $parent.type !== \'List\' && $parent.type !== \'Array\' && $parent.keyName\" ng-init=\"initParentValueType($parent)\"></select>\n	<span ng-show=\"$parent.type === \'Array\' || ($parent.keyName && $parent.valueType !== \'Object\' && $parent.valueType !== \'List\' && $parent.valueType !== \'Array\' && $parent.valueType !== \'string:Object\' && $parent.valueType !== \'string:List\' && $parent.valueType !== \'string:Array\' && $parent.type !== \'List\')\">\n		<input type=\"{{ $parent.valueType == \'string:Number\' || $parent.valueType == \'Number\' ? \'number\' : $parent.valueType == \'string:Boolean\' || $parent.valueType == \'Boolean\' ? \'checkbox\' : \'text\' }}\" ng-model=\"newValueName\" ng-blur=\"changeParentValueName(newValueName, child, $parent)\" placeholder=\"Set a value\" ng-show=\"!($parent.valueType == \'string:Enumeration\' || $parent.valueType == \'Enumeration\')\">\n		<select ng-model=\"selectboxValue\" ng-options=\"option for option in getEnumValues($parent.keyName, child, $parent) track by option\" ng-if=\"$parent.valueType == \'string:Enumeration\' || $parent.valueType == \'Enumeration\'\" ng-blur=\"$parent.valueName = selectboxValue;\"></select>\n	</span>\n\n	<strong ng-if=\"$parent.type === \'List\' && $parent.$parent.$parent.newkey\">{{$parent.$parent.$parent.newkey}}</strong>\n	<button class=\"btn btn-primary btn-sm\" ng-click=\"addItem($parent.keyName, child, $parent)\">\n		Add\n	</button>\n	<button class=\"btn btn-default btn-sm\" ng-click=\"$parent.showAddKey=false\">\n		Cancel\n	</button>\n\n	<table ng-if=\"child[\'$@\'+$parent.keyName]\" class=\"add-item-info-list\">\n		<tr ng-repeat=\"type in [\'eltype\', \'type\', \'default\', \'cases\', \'units\', \'children\', \'description\']\" ng-if=\"child[\'$@\'+$parent.keyName][type]\">\n			<td><strong>{{ type }}</strong></td>\n			<td>{{ child[\'$@\'+$parent.keyName][type] }}</td>\n		</tr>\n	</table>\n</span>\n\n<span ng-if=\"!showAddKey\">\n	<button class=\"addObjectItemBtn\" ng-show=\"$parent.type !== \'List\'\" ng-click=\"$parent.showAddKey = true\">\n		<i class=\"fa fa-plus\" tooltip-placement=\"top\" uib-tooltip=\"Add new item\"></i>\n	</button>\n	<button class=\"addObjectItemBtn\" ng-show=\"$parent.type === \'List\'\" ng-click=\"changeParentKeyName(\'\', child, $parent); initParentValueType($parent); addItem(\'\', child, $parent)\">\n		<i class=\"fa fa-plus-circle\" tooltip-placement=\"top\" uib-tooltip=\"Add new {{$parent.$parent.$parent.newkey}}\"></i>\n	</button>\n</span>");
+angular.module("configurationTemplates", []).run(["$templateCache", function($templateCache) {$templateCache.put("main/view.html","<h1 class=\"left\">{{ rpcName || \'Config &amp; State data\' }}</h1>\n\n<hr class=\"cleaner\" />\n<div ng-init=\"reloadData(false); resetRevisions()\">\n    <button class=\"button small\" ng-click=\"reload()\"><i class=\"fa fa-refresh\"></i> reload data</button>\n    <button class=\"button small\" ng-click=\"getSchema(); showSchema = !showSchema;\" ng-show=\"jsonEditable\"><i class=\"fa fa-info\"></i> toggle schema</button>\n\n    <button class=\"button small\" ng-click=\"undo()\" ng-class=\"{\'grey\': hasUndo()}\" ng-disabled=\"hasUndo()\" ng-show=\"jsonEditable\"><i class=\"fa fa-undo\"></i> history undo</button>\n    <button class=\"button small\" ng-click=\"redo()\" ng-class=\"{\'grey\': hasRedo()}\" ng-disabled=\"hasRedo()\" ng-show=\"jsonEditable\"><i class=\"fa fa-repeat\"></i> history redo</button>\n\n    <button class=\"button small button-left-offset\" ng-click=\"download(jsonData)\"><i class=\"fa fa-download\"></i> Download as JSON</button>\n    <button class=\"button small\" ng-click=\"submitRpc(jsonData)\" ng-if=\"jsonEditable && rpcName\"><i class=\"fa fa-send\"></i> Send RPC</button>\n    <button class=\"button small\" ng-click=\"commitConfiguration()\" ng-if=\"datastore == \'candidate\'\"><i class=\"fa fa-clone\"></i> Commit</button>\n    <button class=\"button small button-green\" ng-click=\"submitConfiguration(jsonData)\" ng-if=\"jsonEditable && !rpcName\"><i class=\"fa fa-save\"></i> Apply changes</button>\n\n    <div ng-if=\"showSchema\" class=\"schema-cover\">\n<pre>\n{{ yangSchema }}\n</pre>\n    </div>\n\n    <div class=\"jsonView\">\n        <json child=\"jsonData\" default-collapsed=\"false\" type=\"object\" hide-collapse=\"true\"></json>\n    </div>\n\n    <!--<hr>-->\n    <!--<div>-->\n        <!--<textarea id=\"jsonTextarea\" ng-model=\"jsonString\"></textarea>-->\n        <!--<span class=\"red\" ng-if=\"!wellFormed\">JSON not well-formed!</span>-->\n    <!--</div>-->\n</div>");
+$templateCache.put("directives/addItem.html","<span ng-if=\"showAddKey && jsonEditable\">\n\n	<span ng-show=\"$parent.type !== \'List\' && $parent.type !== \'Array\'\">\n		<input placeholder=\"{{ typeaheadNoResults ? \'No name available\' : \'Type a letter\' }}\" type=\"text\"\n					 class=\"form-control input-sm addItemKeyInput\" ng-model=\"$parent.keyName\" autocomplete=\"off\" uib-typeahead=\"subchild for subchild in getAvailableNodeNames(key, child, $parent)\" typeahead-min-length=\"0\" typeahead-loading=\"loadingResponses\" typeahead-no-results=\"typeaheadNoResults\" typeahead-focus ng-blur=\"changeParentKeyName($parent.keyName, child, $parent);showSelectbox = true\"\n				/>\n	</span>\n\n	<span class=\"editbar\" ng-if=\"child[\'$@\'+$parent.keyName]\">\n		<i class=\"iconButton fa fa-question-circle\" tooltip-placement=\"top\" uib-tooltip=\"{{child[\'$@\'+$parent.keyName][\'description\']}}\" ng-if=\"child[\'$@\'+$parent.keyName][\'description\']\"></i>\n		<i class=\"iconButton fa fa-asterisk red\" tooltip-placement=\"top\" uib-tooltip=\"Mandatory\" ng-if=\"isMandatory($parent.keyName, child)\"></i>\n	</span>\n\n	<select ng-model=\"$parent.valueType\" ng-options=\"option for option in valueTypes\" class=\"form-control input-sm hidden\" ng-show=\"showSelectbox && $parent.type !== \'List\' && $parent.type !== \'Array\' && $parent.keyName\" ng-init=\"initParentValueType($parent)\"></select>\n	<span ng-show=\"$parent.type === \'Array\' || ($parent.keyName && $parent.valueType !== \'Object\' && $parent.valueType !== \'List\' && $parent.valueType !== \'Array\' && $parent.valueType !== \'string:Object\' && $parent.valueType !== \'string:List\' && $parent.valueType !== \'string:Array\' && $parent.type !== \'List\')\">\n		<input type=\"{{ $parent.valueType == \'string:Number\' || $parent.valueType == \'Number\' ? \'number\' : $parent.valueType == \'string:Boolean\' || $parent.valueType == \'Boolean\' ? \'checkbox\' : \'text\' }}\" ng-model=\"newValueName\" ng-blur=\"changeParentValueName(newValueName, child, $parent)\" placeholder=\"Set a value\" ng-show=\"!($parent.valueType == \'string:Enumeration\' || $parent.valueType == \'Enumeration\')\">\n		<select ng-model=\"selectboxValue\" ng-options=\"option for option in getEnumValues($parent.keyName, child, $parent) track by option\" ng-if=\"$parent.valueType == \'string:Enumeration\' || $parent.valueType == \'Enumeration\'\" ng-blur=\"$parent.valueName = selectboxValue;\"></select>\n	</span>\n\n	<strong ng-if=\"$parent.type === \'List\' && $parent.$parent.$parent.newkey\">{{$parent.$parent.$parent.newkey}}</strong>\n	<button class=\"btn btn-primary btn-sm\" ng-click=\"addItem($parent.keyName, child, $parent)\">\n		Add\n	</button>\n	<button class=\"btn btn-default btn-sm\" ng-click=\"$parent.showAddKey=false\">\n		Cancel\n	</button>\n\n	<table ng-if=\"child[\'$@\'+$parent.keyName]\" class=\"add-item-info-list\">\n		<tr ng-repeat=\"type in [\'eltype\', \'type\', \'default\', \'cases\', \'units\', \'children\', \'description\']\" ng-if=\"child[\'$@\'+$parent.keyName][type]\">\n			<td><strong>{{ type }}</strong></td>\n			<td>{{ child[\'$@\'+$parent.keyName][type] }}</td>\n		</tr>\n	</table>\n</span>\n\n<span ng-if=\"!showAddKey\">\n	<button class=\"addObjectItemBtn\" ng-show=\"$parent.type !== \'List\'\" ng-click=\"$parent.showAddKey = true\">\n		<i class=\"fa fa-plus\" tooltip-placement=\"top\" uib-tooltip=\"Add new item\"></i>\n	</button>\n	<button class=\"addObjectItemBtn\" ng-show=\"$parent.type === \'List\'\" ng-click=\"changeParentKeyName(\'\', child, $parent); initParentValueType($parent); addItem(\'\', child, $parent)\">\n		<i class=\"fa fa-plus-circle\" tooltip-placement=\"top\" uib-tooltip=\"Add new {{$parent.$parent.$parent.newkey}}\"></i>\n	</button>\n</span>");
 $templateCache.put("directives/switchItem.html","<span ng-switch on=\"getType(key, val, child)\">\n	<json ng-switch-when=\"Object\" child=\"val\" type=\"Object\" default-collapsed=\"defaultCollapsed\"></json>\n	<json ng-switch-when=\"Array\" child=\"val\" type=\"Array\" default-collapsed=\"defaultCollapsed\"></json>\n	<json ng-switch-when=\"List\" child=\"val\" type=\"List\" default-collapsed=\"defaultCollapsed\"></json>\n\n	<span ng-switch-when=\"Boolean\">\n		<input type=\"checkbox\" ng-model=\"val\" ng-model-onblur ng-change=\"changeValue(val, key, child, $parent)\" ng-if=\"isConfig(key, child)\" ng-disabled=\"isKey(key, child)\">\n		<span class=\"val\" ng-if=\"!isConfig(key, child)\">{{ val }}</span>\n	</span>\n	<span ng-switch-when=\"Enumeration\">\n		<select ng-model=\"val\" ng-model-onblur ng-change=\"changeValue(val, key, child, $parent)\" ng-if=\"isConfig(key, child)\" ng-disabled=\"isKey(key, child)\" ng-options=\"option for option in getEnumValues(key, child, $parent) track by option\"></select>\n		<span class=\"val\" ng-if=\"!isConfig(key, child)\">{{ val }}</span>\n	</span>\n	<span ng-switch-when=\"Number\">\n		<input type=\"number\" ng-model=\"val\" ng-model-onblur ng-change=\"changeValue(val, key, child, $parent)\" ng-if=\"isConfig(key, child)\" ng-disabled=\"isKey(key, child)\">\n		<span class=\"val\" ng-if=\"!isConfig(key, child)\">{{ val }}</span>\n	</span>\n	<span ng-switch-default class=\"jsonLiteral\">\n		<input type=\"text\" ng-model=\"val\" placeholder=\"Empty\" ng-model-onblur ng-change=\"changeValue(val, key, child, $parent)\"  ng-if=\"isConfig(key, child)\" ng-disabled=\"isKey(key, child)\">\n		<span class=\"val\" ng-if=\"!isConfig(key, child)\">{{ val }}</span>\n	</span>\n\n	<!--<add-item ng-show=\"jsonEditable && !val.length\"></add-item>-->\n</span>");
 $templateCache.put("types/Array.html","<i ng-click=\"toggleCollapse()\" class=\"fa toggle-control\" ng-class=\"chevron\"></i>\n<div class=\"jsonContents\" ng-hide=\"collapsed\">\n	<!-- TODO: sortable only if user-sorted = autohor -->\n	<ol class=\"arrayOl\" ui-sortable=\"sortableOptions\" ng-model=\"child\">\n		<li class=\"arrayItem\" ng-repeat=\"val in child track by $index\">\n			<span><switch-item></switch-item></span>\n		</li>\n	</ol>\n	<add-item ng-show=\"jsonEditable\" valueType=\"Text\"></add-item>\n</div>");
 $templateCache.put("types/List.html","<i ng-click=\"toggleCollapse()\" class=\"fa toggle-control\" ng-class=\"chevron\"></i>\n<div class=\"jsonContents\" ng-hide=\"collapsed\">\n	<!-- TODO: sortable only if user-sorted = autohor -->\n	<ol class=\"listOl\" ui-sortable=\"sortableOptions\" ng-model=\"child\">\n		<li class=\"arrayItem\" ng-repeat=\"val in child track by $index\">\n			<span><switch-item></switch-item></span>\n		</li>\n	</ol>\n	<add-item ng-show=\"jsonEditable\" valueType=\"Object\"></add-item>\n</div>");
-$templateCache.put("types/Object.html","<i ng-click=\"toggleCollapse()\" class=\"fa toggle-control\" ng-class=\"chevron\" ng-if=\"!hideCollapse\"></i>\n<div class=\"jsonContents\" ng-hide=\"collapsed\">\n	<span class=\"block\" ng-repeat=\"(key, val) in child | skipAttributes\" ng-if=\"isVisible(key, child, $parent)\"> <!--ng-class=\"contentStatus\"-->\n		<span ng-class=\"{\'jsonObjectKey\': 1, \'objectOrArrayCover\': isObjectOrArray(key, val, child)}\">\n			<span class=\"key-name\" ng-init=\"newkey=key\">\n				{{ key }}\n				<span class=\"editbar\">\n					<i class=\"iconButton fa fa-question-circle\" tooltip-placement=\"top\" uib-tooltip=\"{{child[\'$@\'+key][\'description\']}}\" ng-if=\"child[\'$@\'+key][\'description\']\"></i>\n					<i class=\"iconButton fa fa-asterisk red\" tooltip-placement=\"top\" uib-tooltip=\"Mandatory\" ng-if=\"isMandatory(key, child)\"></i>\n					<i class=\"iconButton deleteKeyBtn fa fa-trash\" ng-click=\"deleteKey(key, child, $parent)\" ng-if=\"!isMandatory(key, child)\"></i>\n				</span>\n			</span>\n			<!--<input class=\"keyinput\" type=\"text\" ng-model=\"newkey\" ng-init=\"newkey=key\" ng-blur=\"moveKey(child, key, newkey)\"/>-->\n		</span>\n		<span class=\"jsonObjectValue\">\n			<switch-item></switch-item>\n		</span>\n	</span>\n	<add-item ng-show=\"jsonEditable\"></add-item>\n</div>");
-$templateCache.put("main/view.html","<h1 class=\"left\">{{ rpcName || \'Config &amp; State data\' }}</h1>\n\n<hr class=\"cleaner\" />\n<div ng-init=\"reloadData(false); resetRevisions()\">\n    <button class=\"button small\" ng-click=\"reload()\"><i class=\"fa fa-refresh\"></i> reload data</button>\n    <button class=\"button small\" ng-click=\"getSchema(); showSchema = !showSchema;\" ng-show=\"jsonEditable\"><i class=\"fa fa-info\"></i> toggle schema</button>\n\n    <button class=\"button small\" ng-click=\"undo()\" ng-class=\"{\'grey\': hasUndo()}\" ng-disabled=\"hasUndo()\" ng-show=\"jsonEditable\"><i class=\"fa fa-undo\"></i> history undo</button>\n    <button class=\"button small\" ng-click=\"redo()\" ng-class=\"{\'grey\': hasRedo()}\" ng-disabled=\"hasRedo()\" ng-show=\"jsonEditable\"><i class=\"fa fa-repeat\"></i> history redo</button>\n\n    <button class=\"button small button-left-offset\" ng-click=\"download(jsonData)\"><i class=\"fa fa-download\"></i> Download as JSON</button>\n    <button class=\"button small\" ng-click=\"submitRpc(jsonData)\" ng-if=\"jsonEditable && rpcName\"><i class=\"fa fa-send\"></i> Send RPC</button>\n    <button class=\"button small\" ng-click=\"commitConfiguration()\" ng-if=\"datastore == \'candidate\'\"><i class=\"fa fa-clone\"></i> Commit</button>\n    <button class=\"button small button-green\" ng-click=\"submitConfiguration(jsonData)\" ng-if=\"jsonEditable && !rpcName\"><i class=\"fa fa-save\"></i> Apply changes</button>\n\n    <div ng-if=\"showSchema\" class=\"schema-cover\">\n<pre>\n{{ yangSchema }}\n</pre>\n    </div>\n\n    <div class=\"jsonView\">\n        <json child=\"jsonData\" default-collapsed=\"false\" type=\"object\" hide-collapse=\"true\"></json>\n    </div>\n\n    <!--<hr>-->\n    <!--<div>-->\n        <!--<textarea id=\"jsonTextarea\" ng-model=\"jsonString\"></textarea>-->\n        <!--<span class=\"red\" ng-if=\"!wellFormed\">JSON not well-formed!</span>-->\n    <!--</div>-->\n</div>");}]);
\ No newline at end of file
+$templateCache.put("types/Object.html","<i ng-click=\"toggleCollapse()\" class=\"fa toggle-control\" ng-class=\"chevron\" ng-if=\"!hideCollapse\"></i>\n<div class=\"jsonContents\" ng-hide=\"collapsed\">\n	<span class=\"block\" ng-repeat=\"(key, val) in child | skipAttributes\" ng-if=\"isVisible(key, child, $parent)\"> <!--ng-class=\"contentStatus\"-->\n		<span ng-class=\"{\'jsonObjectKey\': 1, \'objectOrArrayCover\': isObjectOrArray(key, val, child)}\">\n			<span class=\"key-name\" ng-init=\"newkey=key\">\n				{{ key }}\n				<span class=\"editbar\">\n					<i class=\"iconButton fa fa-question-circle\" tooltip-placement=\"top\" uib-tooltip=\"{{child[\'$@\'+key][\'description\']}}\" ng-if=\"child[\'$@\'+key][\'description\']\"></i>\n					<i class=\"iconButton fa fa-asterisk red\" tooltip-placement=\"top\" uib-tooltip=\"Mandatory\" ng-if=\"isMandatory(key, child)\"></i>\n					<i class=\"iconButton deleteKeyBtn fa fa-trash\" ng-click=\"deleteKey(key, child, $parent)\" ng-if=\"!isMandatory(key, child)\"></i>\n				</span>\n			</span>\n			<!--<input class=\"keyinput\" type=\"text\" ng-model=\"newkey\" ng-init=\"newkey=key\" ng-blur=\"moveKey(child, key, newkey)\"/>-->\n		</span>\n		<span class=\"jsonObjectValue\">\n			<switch-item></switch-item>\n		</span>\n	</span>\n	<add-item ng-show=\"jsonEditable\"></add-item>\n</div>");}]);
\ No newline at end of file