diff --git a/panther2d.js b/panther2d.js
index 80f355cfa1bc119b202913e69c0a4465604ea5d6..a8976eb28a3973b61b6c53597d2d9ea142d33b19 100644
--- a/panther2d.js
+++ b/panther2d.js
@@ -11,7 +11,8 @@
 	let historytime = + new Date();
 	let fel1 = false;
 	let fel2 = false;
-	let pinTooltip = false
+	let pinTooltip = false;
+	let clickStat = false;
 	const panZoomTime = 500;
 	const facilities = [''];
 	const names = [];
@@ -230,6 +231,7 @@
 		}
 	}
 	function measurementDisable() {
+		$('#measurement').hide();
 		clearmeasurement();
 		main.removeEventListener(measurementEvent, measurementListener, false);
 		main.style.cursor = 'default';
@@ -349,8 +351,6 @@
 	gui.add(menuParams, 'vlv').name('vlv & bst').onChange(function() {toggleParam('vlv');});
 	menuParams.ps = document.location.search.indexOf('ps')>-1;
 	gui.add(menuParams, 'ps').onChange(function() {toggleParam('ps');});
-	menuParams.measurement = document.location.search.indexOf('measurement')>-1;
-	gui.add(menuParams, 'measurement').onChange(function() {toggleParam('measurement');});
 	const sstring = $('.controller.string').children().eq(1).children().eq(0);
 	sstring.attr('id', 'sname');
 	sstring.attr('name', 'sname');
@@ -479,7 +479,6 @@
 		fetch(latticeFile).then((response) => {return response.json();}).then((flattice) => {
 			lattice = flattice;
 			if (Object.keys(lattice).length>0) {
-				gui.add(menuParams, 'measurement button', {Left: 'left', Right: 'right'}).onChange(measurementFacility);
 				const measurementDevice = {'': ''};
 				const machineFolder = gui.addFolder('toggle facility');
 				for (let i in lattice) {if (i!='conf') facilities.push(i);}
@@ -509,6 +508,11 @@
 				}
 				for (let i=0; i<facilities.length; i++) if (facilities[i]!='') {machineFolder.add(menuParams, facilities[i]).onChange(toggleFacility);}
 				machineFolder.close();
+				menuParams.measurement = document.location.search.indexOf('measurement')>-1;
+				gui.add(menuParams, 'measurement').onChange(function() {toggleParam('measurement');});
+				menuParams['measurement button'] = 'right';
+				gui.add(menuParams, 'measurement button', {Left: 'left', Right: 'right'}).onChange(measurementFacility);
+				menuParams['measurement device'] = '';
 				gui.add(menuParams, 'measurement device', measurementDevice).onChange(measurementFacility);
 				if (document.location.search.indexOf('measurement')==-1) measurementToggle(false);
 				if (document.location.search.indexOf('servicearea')>-1) initSearch(lattice.servicearea.sections, 'servicearea');
@@ -728,6 +732,7 @@
 		}
 	}
 	function hideTooltip() {
+		clickStat = !clickStat;
 		if (pinTooltip) {pinTooltip = false; return;}
 		if (hideTimeout!==false) clearTimeout(hideTimeout);
 		hideTimeout = false;
@@ -758,10 +763,12 @@
 		const jelem = $(elem);
 		if (myclass) {/*mylog(elem, jelem, myclass);*/ elem.classList.add(myclass);}
 		for (let i in attrib) {
-			jelem.attr(i, attrib[i]);
+			// if (tagName=='line') console.log('line', i, attrib[i]);
+			jelem.attr(i, ''+attrib[i]);
 		}
 		const hook = appendTo.indexOf('.')==0? appendTo.replace(' ','_'): appendTo.replace('.','_').replace(' ','_');
 		$(hook).append(jelem);
+		return elem;
 	}
 	function appendSearch(component, facility) {
 		// mylog('appendSearch()',component, facility);
@@ -1092,7 +1099,7 @@
 		else {
 			$('.bending').css('font-size', newScale<1? 1200: 600);
 			$('.bending').css('translate', '('+(newScale<1? 1200: 600)+',0)');
-			$('.trajectory').css('stroke-width', newScale<1? 450: 150);
+			$('.trajectory').css('stroke-width', newScale<0.7? 800: (newScale<1? 400: 200));
 			$('.label').hide();
 		}
 		for (let i=1; i<=15; i++) if (newScale>i) $('.zoom'+i).show(); else $('.zoom'+i).hide();