diff --git a/TestMult.html b/TestMult.html
index e05de3a..88ef501 100644
--- a/TestMult.html
+++ b/TestMult.html
@@ -8,69 +8,158 @@
    <link rel="stylesheet" href="https://js.arcgis.com/3.15/dijit/themes/claro/claro.css">
    <link rel="stylesheet" href="https://js.arcgis.com/3.15/esri/css/esri.css">
    <style>
-      html,
-      body,
-      #map {
-         height: 100%;
-         width: 100%;
-         margin: 0;
-         padding: 0;
-      }
-      #search {
+    html, body, #borderContainer, #map {
+	  width: 100%;
+	  height: 100%;
+	}
+
+	html, body {
+	  margin: 0;
+	  overflow: hidden;
+	}
+
+	#tablePane, #mapPane, #toolsPane {
+	  padding: 0;
+	}
+
+	#toolsPane {
+	  width: 250px;
+	}
+
+	#tablePane {
+	  height: 200px;
+	}
+
+	#map progress {
+	  position: absolute;
+	  z-index: 1;
+	  width: 100%;
+	  bottom: 2em;
+	  left: 0;
+	}
+
+	/* Hide the progress bar when map is not updating */
+	#map:not([data-updating]) progress {
+	  display: none;
+	}
+
+   
+	#search {
          display: block;
          position: absolute;
-         z-index: 2;
-         top: 25px;
-         left: 74px;
+         z-index: 40;
+         top: 100px;
+         left: 65px;
       }
-	  span.dijit.dijitReset.dijitInline.dijitToggleButton {
-			display: inline-block;
-			border: 0;
-			padding: 0;
-			vertical-align: middle;
-			position: absolute;
-		}
-	  #turnOnOff{
-		font-family: "arial" ;
-		font-weight: bolder;
-		z-index: 50;
-		backgound-color:#CEDAE6;
+	#infobox {
+		top: 31px;
+		color: #444;
+		height: auto;
+		font-family: arial;
+		font-weight: bold;
+		font-size: 12px;
+		left: 60px;
+		margin: 5px;
+		padding: 10px;
+		position: absolute;
+		width: 400px;
+		z-index: 40;
 		border: solid 1px #001B33;
 		border-radius: 4px;
-		 position: absolute;
-		 top: 50px;
-		 left: 74px;
-	  }
-	  .esriPopup .action.zoomTo { display: none; }
-	  #BasemapToggle {
+		background-color:  #f2f2f2;
+      }
+
+		  #BasemapToggle {
 		position: absolute;
 		bottom: 20px;
 		left: 20px;
 		z-index: 45;
 	  }
+	  	  .esriPopup .action.zoomTo { display: none; }
+	#headtable {
+		border: 0px solid #0052A3;
+		background-color: #0052A3;
+		width: 100%;	
+	}
+	.claro .dijitContentPane {
+    padding: 0;
+	}
+	#toolsPane{
+	background-color: #f2f2f2;
+	}
+	.leading, .center, .tailing {		
+		border: 0px solid #0052A3;
+		background-color: #0052A3;
+		font-family: arial;
+        font-weight: bold;
+		color: white;
+		 }
+	a:link {
+		text-decoration: none;
+	}
+
+	a:visited {
+		text-decoration: none;
+	}
+
+	a:hover {
+		text-decoration: none;
+		color:  #ff6600;
+	}
    </style>
 
    </script>
 <script src="https://js.arcgis.com/3.15/"></script>
    <script>
-      require([
-        "esri/map","esri/dijit/BasemapToggle",
-		"esri/dijit/Search", "esri/layers/FeatureLayer", "dijit/form/ToggleButton","esri/InfoTemplate", "dojo/dom", "dojo/on","esri/tasks/query", "esri/tasks/QueryTask",
+		require([
+	  "esri/map",
+	  "esri/dijit/BasemapToggle",
+	  "esri/layers/FeatureLayer",
+	  "esri/dijit/FeatureTable",
+	  "esri/dijit/LayerList",
+	  "esri/dijit/Search",
+	  "esri/InfoTemplate",
+	  "dojo/dom-construct",
+	   "dojo/dom", "dojo/on",
+	   "esri/tasks/query", 
+	  "esri/tasks/QueryTask",
+	  "esri/symbols/SimpleLineSymbol",
+	  "esri/symbols/SimpleFillSymbol",
+	  "esri/renderers/SimpleRenderer",
+	  "esri/Color",
+	  "esri/graphic",
+	  "esri/lang",
+	  "dojo/number",
+      "dojo/dom-style",
+	  "dojo/parser",
+	  "dijit/TooltipDialog",
+	  "dijit/popup",
+	  "dijit/TitlePane",
+	  "dijit/registry",
+	  "dijit/layout/BorderContainer",
+	  "dijit/layout/ContentPane",
+	  "dijit/form/ToggleButton",
 		"dojo/domReady!"
-      ], function (Map, BasemapToggle, Search, FeatureLayer, ToggleButton,InfoTemplate,dom, on,Query, QueryTask) {
+	], function(Map, BasemapToggle, FeatureLayer, FeatureTable, LayerList, Search,InfoTemplate,domConstruct, dom, on, Query, QueryTask, SimpleLineSymbol, SimpleFillSymbol, SimpleRenderer, Color, Graphic, esriLang,number, domStyle, parser,TooltipDialog,dijitPopup, TitlePane,registry,
+	ToggleButton) {
+
+        
+
+	  parser.parse();
+
          var map = new Map("map", {
             basemap: "streets",
             center: [-74.005941, 40.712784], // lon, lat
             zoom: 17
          });
-
+	  
 		 //ArcGIS Online feature service showing Mahattan Tc2 lots
-         var layer = new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/TC2_MH_noncd122015/FeatureServer/0", {
+         var layer = new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/TC2_MH_noncd1210/FeatureServer/0", {
             outFields: ["*"],
-            maxScale:1000,
+            maxScale:500,
             minScale:5000,
-			id:'noncd',
-			infoTemplate: new InfoTemplate("Parcel: ${BORO}/${BLOCK}/${LOT}",
+			id:'noncd'
+			/*infoTemplate: new InfoTemplate("Parcel: ${BORO}/${BLOCK}/${LOT}",
 					"</br>DOF Value 2016 Tentative: $</b>${fmv:NumberFormat}</br>"
 					+"</br>Adress:${Street_Num}, ${Street_Nam}, New York, NY</br>"
 					+"</br>Total Units:${resunit}</br>"
@@ -82,23 +171,39 @@
 					+"<div> <a href='http://www1.nyc.gov/site/finance/benefits/property-related-benefits.page'  target='_blank'>Exemptions and Abatements</a></div>"
 					+"<div> <a href='http://www1.nyc.gov/site/finance/taxes/property-forms/property-forms-assessments-and-valuations.page' target='_blank'>Request Data Correction</a></div>"
 					+"<div> </br><a href='http://maps.google.com/?q=${Street_Num} ${Street_Nam}, new york, ny' target='_blank'>Search on Google Map</a></div>"
-					)
+					)*/
          });
+		 layer.maxScale=500;
+		 layer.minScale=5000;
+         var symbol1 = new SimpleFillSymbol().setColor(new Color([0,108,108,0.15]));
+		 symbol1.setOutline(new SimpleLineSymbol(esri.symbol.SimpleLineSymbol.STYLE_SOLID, new Color([0,100,156]), 1));
+		 var renderer = new SimpleRenderer(symbol1);
+ 		 layer.setRenderer(renderer);
 		 //Condo Suffix layer
-         var layercdm = new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/TC2_MH_cdmain122015/FeatureServer/0", {
+         var layercdm = new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/MHcdmain/FeatureServer/0", {
             outFields: ["*"],
-            maxScale:1000,
+            maxScale:500,
             minScale:5000,
 			id:'cd'
+			/*infoTemplate: new InfoTemplate("Parcel: ${Boro}/${Block}/${Lot}",
+				"</br>Adress:${Street_Num}, ${Street_Nam}, New York, NY</br>"
+				+"<div> <a href='http://www1.nyc.gov/site/finance/taxes/property.page'  target='_blank'>View Property Tax Bills</a></div>"
+				+"<div> <a href='http://www1.nyc.gov/site/finance/benefits/property-related-benefits.page'  target='_blank'>Exemptions and Abatements</a></div>"
+				+"<div> <a href='http://www1.nyc.gov/site/finance/taxes/property-forms/property-forms-assessments-and-valuations.page' target='_blank'>Request Data Correction</a></div>"
+				+"<div> </br><a href='http://maps.google.com/?q=${Street_Num} ${Street_Nam}, new york, ny' target='_blank'>Search on Google Map</a></div>"
+				)*/
          });
-		 //Condo Suffix layer
-         var layercds = new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/mhcdsuff/FeatureServer/0", {
-            outFields: ["*"],
-            maxScale:1000,
-            minScale:5000
-         });
+
 		//Add layers to map
         map.addLayers([layer,layercdm]);
+		//close the dialog when the mouse leaves the highlight graphic
+		map.on("load", function(){
+          map.graphics.enableMouseEvents();
+          map.graphics.on("mouse-out", closeDialog);
+          
+        });
+		
+		
 		//SET UP BASEMAP TOGGLE
 		var toggle = new BasemapToggle({
 			map: map,
@@ -106,8 +211,84 @@
 		}, "BasemapToggle");
 		toggle.startup();
 		
+
 		
+		//Info Window: set size
+        map.infoWindow.resize(245,300);
+		//4.a. Hover popup window set up
+        dialog = new TooltipDialog({
+          id: "tooltipDialog",
+
+          style: "position: absolute; width: 200px; font: normal normal normal 10pt Tahoma;z-index:100"
+        });
+        dialog.startup();
+
+        dojo.style(dialog.domNode, "opacity", 0.75);
+
+        var highlightSymbol = new SimpleFillSymbol(
+          SimpleFillSymbol.STYLE_SOLID,
+          new SimpleLineSymbol(
+            SimpleLineSymbol.STYLE_SOLID,
+            new Color([0,50,255]), 3
+          ),
+          new Color([125,125,125,0.35])
+        );
+		///4.b. HOVER FUNCTION
+        //listen for when the onMouseOver event fires on the layer
+        //when fired, create a new graphic with the geometry from the event.graphic and add it to the maps graphics layer
+ 		var hovergraph = new esri.layers.GraphicsLayer();
+        layer.on("mouse-over", function(evt){
+			closeDialog();
+          var t = "<b>${BORO}/${BLOCK}/${LOT}</b><hr><b>Adress:</b>${Street_Num}, ${Street_Nam}, New York, NY<br><b>DOF Value 2017 Tentative: $</b>${fmv:NumberFormat}<br>";
+          var content = esriLang.substitute(evt.graphic.attributes,t);
+          //var highlightGraphic = new Graphic(evt.graphic.geometry,highlightSymbol);
+          //map.graphics.add(highlightGraphic);
+			map.addLayer(hovergraph);
+			var highlightGraphic = new Graphic(evt.graphic.geometry,highlightSymbol);
+			hovergraph.add(highlightGraphic);
+          dialog.setContent(content);
 
+          domStyle.set(dialog.domNode, "opacity", 0.85);
+          dijitPopup.open({
+            popup: dialog,
+            x: evt.pageX,
+            y: evt.pageY
+          });
+          var t2 = "${BORO}/${BLOCK}/${LOT}"; //add for search on click
+		  curBBL = esriLang.substitute(evt.graphic.attributes, t2);//add for search on click(4.b)
+       	    map.setMapCursor("pointer"); //Add mouse change at hover
+        });        
+		layercdm.on("mouse-over", function(evt){
+			closeDialog();
+          var t = "<b>${Boro}/${Block}/${Lot}</b><hr><b>Adress:</b>${Street_Num}, ${Street_Nam}, New York, NY<br>";
+          var content = esriLang.substitute(evt.graphic.attributes,t);
+		//var symbol = new esri.symbol.SimpleFillSymbol();
+        //symbol.setColor(new dojo.Color([150,150,150,0.5]));
+        map.addLayer(hovergraph);
+		//var feature = evt.graphic.geometry;
+		//hovergraph.add(feature);
+		var highlightGraphic = new Graphic(evt.graphic.geometry,highlightSymbol);
+        //map.graphics.add(highlightGraphic);
+		hovergraph.add(highlightGraphic);
+          dialog.setContent(content);
+          domStyle.set(dialog.domNode, "opacity", 0.65);
+          dijitPopup.open({
+            popup: dialog,
+            x: evt.pageX,
+            y: evt.pageY
+          });
+          var t2 = "{Boro}/${Block}/${Lot}"; //add for search on click
+		  curBBL = esriLang.substitute(evt.graphic.attributes, t2);//add for search on click(4.b)
+       	    map.setMapCursor("pointer"); //Add mouse change at hover
+        });
+        function closeDialog() {
+          //map.graphics.clear();
+		  if (hovergraph){
+		  hovergraph.clear();
+		  }
+          map.setMapCursor("default"); //set mouse pointer back
+          dijitPopup.close(dialog);
+        }
 
 		//Search
          var s = new Search({
@@ -138,7 +319,7 @@
             maxSuggestions: 3,
 
             //Create an InfoTemplate and include three fields
-                         infoTemplate: new InfoTemplate("Parcel: ${BORO}/${BLOCK}/${LOT}",
+            infoTemplate: new InfoTemplate("Parcel: ${BORO}/${BLOCK}/${LOT}",
 					"</br>DOF Value 2016 Tentative: $</b>${fmv:NumberFormat}</br>"
 					+"</br>Adress:${Street_Num}, ${Street_Nam}, New York, NY</br>"
 					+"</br>Total Units:${resunit}</br>"
@@ -156,9 +337,9 @@
          });
 
          sources.push({
-            featureLayer: new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/TC2_MH_cdmain122015/FeatureServer/0"),
-            searchFields: ["CONDO_KEY"],
-            displayField: "CONDO_KEY",
+            featureLayer: new FeatureLayer("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/MHcdmain/FeatureServer/0"),
+            searchFields: ["bl_sp"],
+            displayField: "bl_sp",
             exactMatch: true,
             name: "Search on Condo main",
             outFields: ["*"],
@@ -168,14 +349,13 @@
 
             //Create an InfoTemplate
 
-                          infoTemplate: new InfoTemplate("Parcel: ${CONDO_KEY}",
-					"<div></br> <a href='http://www1.nyc.gov/site/finance/taxes/property.page'  target='_blank'>View Property Tax Bills</a></div>"
-					+"<div> <a href='http://www1.nyc.gov/site/finance/benefits/property-related-benefits.page'  target='_blank'>Exemptions and Abatements</a></div>"
-					+"<div> <a href='http://www1.nyc.gov/site/finance/taxes/property-forms/property-forms-assessments-and-valuations.page' target='_blank'>Request Data Correction</a></div>"
-					+"<div> </br><a href='http://maps.google.com/?q=${Street_Num} ${Street_Nam}, new york, ny' target='_blank'>Search on Google Map</a></div>"
-					+"<div> </br><a href='http://maps.googleapis.com/maps/api/streetview?location=${Street_Num} ${Street_Nam}, new york, ny&size=600x400&fov=360&heading=235&pitch=10' target='_blank'>Google Street View</a></div>"
-					
-					),
+			infoTemplate: new InfoTemplate("Parcel: ${Boro}/${Block}/${Lot}",
+				"</br>Adress:${Street_Num}, ${Street_Nam}, New York, NY</br>"
+				+"<div> <a href='http://www1.nyc.gov/site/finance/taxes/property.page'  target='_blank'>View Property Tax Bills</a></div>"
+				+"<div> <a href='http://www1.nyc.gov/site/finance/benefits/property-related-benefits.page'  target='_blank'>Exemptions and Abatements</a></div>"
+				+"<div> <a href='http://www1.nyc.gov/site/finance/taxes/property-forms/property-forms-assessments-and-valuations.page' target='_blank'>Request Data Correction</a></div>"
+				+"<div> </br><a href='http://maps.google.com/?q=${Street_Num} ${Street_Nam}, new york, ny' target='_blank'>Search on Google Map</a></div>"
+				),
             
             enableSuggestions: true,
             minCharacters: 0
@@ -191,35 +371,48 @@
 			rs = e.results;
 			h = "";
 			if (rs[1] == null){
-				h = "<div> rs is null</div>";
-				return;
+				if( rs[0]==null){
+					h = "<div> rs is null</div>";
+					return;	
+				}else{//NON CONDO ([0])
+					var resultItems = [];
+					
+					/*if (titlePane11){
+					var ch=1;
+					titlePane11.destroyRecursive();
+					};
+					var widgets = dijit.findWidgets("toolsPane");
+					dojo.forEach(widgets, function(w) {
+						w.destroyRecursive(false);
+					});*/
+					dijit.byId("toolsPane").destroyDescendants(false);
+					domConstruct.empty("toolsPane");
+					var containerNode = dojo.byId("toolsPane");
+
+					var featureAttributes = rs[0][0].feature.attributes;
+					for (var attr in featureAttributes) {
+					  resultItems.push("<b>" + attr + ":</b>  " + featureAttributes[attr] + "<br>");
+					}
+					resultItems.push("<br>");
+					var titlePane1 = new TitlePane({
+						id: "titlePane11",
+						open: true, 
+						title: featureAttributes.bbl_sp,
+						content: resultItems           
+					}, domConstruct.create('div', {}, containerNode));
+				};
+			}else{//CONDO ([1])
+				//h = inspect(rs[0][0].feature.attributes, 5, 0);
+				var attrs = rs[1][0].feature.attributes;
+				searchcd=attrs.CONDO_KEY;			
 			};
-			//h = inspect(rs[0][0].feature.attributes, 5, 0);
-			var attrs = rs[1][0].feature.attributes;
-			searchcd=attrs.CONDO_KEY;
+
 		});
+		
 
          s.startup();
+
 		 
-		 new ToggleButton({
-				  showLabel: true,
-				  onChange: function(val){            
-					if(val == true){
-					  layercdm.setVisibility(false);
-					  layer.setVisibility(true);
-					  this.set('label', 'Show and Search on  Condo');
-					  s.set("activeSourceIndex", 0);
-				   }
-				   else{
-					layercdm.setVisibility(true); 
-					layer.setVisibility(false);					
-					this.set('label', 'Show and Search on non Condo');
-					s.set("activeSourceIndex", 1);
-				   }
-				  },
-				  label: "Show and Search on non Condo"
-				}, "turnOnOff");
-      
 		 //Query1216
 		 //Initiate Query
 		var queryTask = new QueryTask("//services3.arcgis.com/aD88pT4hjL80xq0F/arcgis/rest/services/MHcdsuffix/FeatureServer/0");
@@ -229,38 +422,102 @@
 		//Execute Query
 		on(dom.byId("execute"), "click", execute);
 		function execute () {
+		//dojo.empty("toolsPane");
 		  query.where = "CONDO_KEY = "+searchcd ;
 		  queryTask.execute(query, showResults,function(error){console.log(error);});
 		}
 		function showResults (results) {
 		  var resultItems = [];
 		  var resultCount = results.features.length;
+		  dijit.byId("toolsPane").destroyDescendants(false);
+			//domConstruct.empty("toolsPane");
+			var containerNode = dojo.byId("toolsPane");
 		  for (var i = 0; i < resultCount; i++) {
 			var featureAttributes = results.features[i].attributes;
 			for (var attr in featureAttributes) {
-			  resultItems.push("<b>" + attr + ":</b>  " + featureAttributes[attr] + "<br>");
+			  resultItems.push("<tr><td><div class='datanames'> "+attr +": </div></td><td><div class='dataitem'>"+featureAttributes[attr]+"</div> </td></tr>");
+			  //resultItems.push("<b>" + attr + ":</b>  " + featureAttributes[attr] + "<br>");
 			}
+			
 			resultItems.push("<br>");
+			
+			if (i==0){
+				var titlePane1 = new TitlePane({
+					id: "titlePane"+i,
+					open: true, 
+					title: featureAttributes.bblu_sp,
+					content: resultItems           
+				}, domConstruct.create('div', {}, containerNode));
+			}else{
+				var titlePane1 = new TitlePane({
+					id: "titlePane"+i,
+					open: false, 
+					title: featureAttributes.bblu_sp,
+					content: resultItems           
+				}, domConstruct.create('div', {}, containerNode));
+			}
+			//"titlePane"+i);
+			/*var titlePane1= new dijit.TitlePane({
+				title:"This is a title pane",    
+				content: new ContentPane({
+					content:resultItems,
+				})
+			}, domConstruct.create('div', {}, containerNode));*/
 		  }
-		  dom.byId("info").innerHTML = resultItems.join("");
-		}
+		  /*dom.byId("toolsPane").innerHTML = "<div id='titlePane0'></div>"*/
+		};
 		
+		
+	  /*var layerList = new LayerList({
+		map: map,
+		showLegend: true,
+		showOpacitySlider: true,
+		showSublayers: true
+	  }, "layerList");
+	  layerList.startup();*/
 	  
-	  });
-
 
+	});
    </script>
 </head>
 
-<body>
-  <!--input type="text" id="blu_sp" value="134/7503/R1"-->
-    <input id="execute" type="button" value="Get Details">
-	<button id="turnOnOff">Show and Search on non Condo</button>
-   <div id="search"></div>
-   <div id="map">
-		<div id="BasemapToggle"></div>
-   </div>   
-    <div id="info" style="padding:5px; margin:5px; background-color:#eee;">
+
+  <body class="claro">
+  <div data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="gutters:false, design:'headline'" id="borderContainer">
+    <div id="topPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'top'">
+      	
+		<table id= headtable>
+			<tr>
+				<td><img class=leading style= "padding-top:2px; padding-left: 5px;" src="http://www1.nyc.gov/assets/home/images/global/nyc_white.png"  height="12" width="37"></td>
+				<td><div class=center>| Tax Class 2 Property Search Map: Manhattan</div></td>
+				<td><a class=tailing href='http://www1.nyc.gov' target='_blank'>| Home</a></td>
+			</tr>
+		</table>
+    </div>
+    <div id="toolsPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'leading', splitter: true">
+      <!--div id="layerList"></div-->
+	<div></br>Search for a property to display details</div>
+	<!--div id="titlePane3"></div-->
+    </div>
+    <div id="mapPane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'center'">
+      <div id="map">
+        <div id="BasemapToggle"></div>
+		<div id="infobox">
+			<div>Click on the Arrow and select property type to search.(Default: condo)</div>
+			<div>Then enter Block/Lot in box.</div>
+			<div>For Example:  1845/7501</div>
+		</div>
+        <div id="search"></div>
+		<div id="info" >
+	<input id="execute" type="button" value="Get Details">
+		<progress>Loading...</progress>
+      </div>
+    </div>
+	
+    <!--div id="tablePane" data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region: 'bottom', splitter: true">
+      <div id="table"></div>
+    </div-->
+  </div>
 </body>
 
 </html>