diff --git a/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo b/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
index 535f60d9f7..c351fd33e0 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
+++ b/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
@@ -169,7 +169,7 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(vol[1].ports[1],senMasFlo.port_b) annotation (Line(
-      points={{-24,-40},{-24,-50},{-60,-50}},
+      points={{-23,-40},{-23,-50},{-60,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(cap.port,HexToTan.solid) annotation (Line(
@@ -185,7 +185,7 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(temSenHex.T, hAPipIns.T)     annotation (Line(
-      points={{-10,-70},{0,-70},{0,-76},{9,-76}},
+      points={{-9,-70},{0,-70},{0,-76},{9,-76}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(hAPipIns.hA, htfToHex.Gc)     annotation (Line(
@@ -202,12 +202,12 @@ equation
       smooth=Smooth.None));
   connect(temSenSur.T, hANatCyl.TSur)
                                      annotation (Line(
-      points={{20,52},{20,70},{-40,70},{-40,114},{-2,114}},
+      points={{20,53},{20,70},{-40,70},{-40,114},{-2,114}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(hANatCyl.TFlu, temSenWat.T)
                                      annotation (Line(
-      points={{-2,106},{-36,106},{-36,76},{68,76},{68,50}},
+      points={{-2,106},{-36,106},{-36,76},{68,76},{68,51}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(port_a, senMasFlo.port_a) annotation (Line(
@@ -215,7 +215,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(vol[nSeg].ports[2], res.port_a) annotation (Line(
-      points={{-20,-40},{-20,-50},{46,-50}},
+      points={{-21,-40},{-21,-50},{46,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(res.port_b, port_b) annotation (Line(
@@ -238,7 +238,7 @@ equation
             -150},{100,150}}), graphics), Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-100,-150},{100,150}}), graphics={
         Rectangle(
-          extent={{-66,64},{74,-96}},
+          extent={{-70,64},{70,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={95,95,95},
@@ -250,25 +250,25 @@ equation
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-66,-12},{74,-18}},
+          extent={{-70,-12},{70,-18}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-36,64},{-32,-96}},
+          extent={{-40,64},{-36,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{2,64},{6,-96}},
+          extent={{-2,64},{2,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{40,64},{44,-96}},
+          extent={{36,64},{40,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
diff --git a/IBPSA/Fluid/Storage/Examples/Stratified.mo b/IBPSA/Fluid/Storage/Examples/Stratified.mo
index 93e8b36590..bf0cae839c 100644
--- a/IBPSA/Fluid/Storage/Examples/Stratified.mo
+++ b/IBPSA/Fluid/Storage/Examples/Stratified.mo
@@ -42,7 +42,7 @@ model Stratified "Test model for stratified tank"
     nSeg=10,
     m_flow_nominal=0.1,
     VTan=3) "Tank"
-    annotation (Placement(transformation(extent={{-18,-70},{2,-50}})));
+    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
   IBPSA.Fluid.FixedResistances.PressureDrop res_2(
     from_dp=true,
     redeclare package Medium = Medium,
@@ -92,7 +92,7 @@ equation
   connect(HOut_flow.port_b, res_1.port_a)
     annotation (Line(points={{20,-8},{34,-8}}, color={0,127,255}));
   connect(tanEnh.port_b, HOut_flow1.port_a)
-    annotation (Line(points={{-8,-70},{-8,-80},{20,-80}},
+    annotation (Line(points={{-10,-70},{-10,-80},{20,-80}},
                                                color={0,127,255}));
   connect(HOut_flow1.port_b, res_2.port_a) annotation (Line(points={{36,-80},{
           40,-80}}, color={0,127,255}));
@@ -114,9 +114,9 @@ equation
   connect(sine.y, TBCTop2.T) annotation (Line(points={{-69,72},{-56,72},{-56,38},
           {-41.2,38}}, color={0,0,127}));
   connect(TBCSid2.port, tanEnh.heaPorSid) annotation (Line(points={{-28,56},{
-          -24,56},{-24,-12},{-2,-12},{-2,-60},{-2.4,-60}}, color={191,0,0}));
+          -24,56},{-24,-12},{-4.4,-12},{-4.4,-60}},        color={191,0,0}));
   connect(TBCTop2.port, tanEnh.heaPorTop) annotation (Line(points={{-28,38},{
-          -26,38},{-26,-14},{-6,-14},{-6,-52.6}}, color={191,0,0}));
+          -26,38},{-26,-14},{-8,-14},{-8,-52.6}}, color={191,0,0}));
   connect(sin_1.ports[1], res_1.port_b) annotation (Line(
       points={{70,-9},{64,-9},{64,-8},{54,-8}},
       color={0,127,255},
@@ -130,7 +130,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(sou_1.ports[2], tanEnh.port_a) annotation (Line(
-      points={{-40,9},{-30,9},{-30,-40},{-8,-40},{-8,-50}},
+      points={{-40,9},{-30,9},{-30,-40},{-10,-40},{-10,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(TBCSid1.port, tanSim.heaPorSid) annotation (Line(
diff --git a/IBPSA/Fluid/Storage/StratifiedEnhanced.mo b/IBPSA/Fluid/Storage/StratifiedEnhanced.mo
index ea105bc83c..69d9596b67 100644
--- a/IBPSA/Fluid/Storage/StratifiedEnhanced.mo
+++ b/IBPSA/Fluid/Storage/StratifiedEnhanced.mo
@@ -43,16 +43,16 @@ equation
           {-40,-80},{14,-80},{14,-16},{16,-16}},color={0,127,255}));
   connect(vol[nSeg].ports[2], H_b_flow.port_a) annotation (Line(points={{16,-16},
           {14,-16},{14,-80},{50,-80}}, color={0,127,255}));
-  connect(H_b_flow.port_b, port_b) annotation (Line(points={{70,-80},{80,-80},{80,
-          0},{100,0}}, color={0,127,255}));
+  connect(H_b_flow.port_b, port_b) annotation (Line(points={{70,-80},{80,-80},{
+          80,-100},{0,-100}}, color={0,127,255}));
   for i in 1:(nSeg-1) loop
     connect(vol[i].ports[2], H_vol_flow[i].port_a) annotation (Line(points={{16,
             -16},{16,-20},{-28,-20},{-28,-40},{-20,-40}}, color={0,127,255}));
     connect(H_vol_flow[i].port_b, vol[i + 1].ports[1]) annotation (Line(points={{0,-40},
             {4,-40},{4,-16},{16,-16}},         color={0,127,255}));
   end for;
-  connect(port_a, H_a_flow.port_a) annotation (Line(points={{-100,0},{
-          -80,0},{-80,-80},{-60,-80}}, color={0,127,255}));
+  connect(port_a, H_a_flow.port_a) annotation (Line(points={{0,100},{-96,100},{
+          -96,-80},{-60,-80}}, color={0,127,255}));
 
   connect(vol[1:nSeg].ports[3], str.fluidPort[2:nSeg+1])
    annotation (Line(points={{16,-16},{16,-18},{-66,-18},{-66,-40},{-60,-40}},
@@ -69,10 +69,10 @@ equation
                                                   color={0,0,127}));
   connect(str.heatPort, vol.heatPort)    annotation (Line(points={{-40,-40},{
           -32,-40},{-32,10},{6,10},{6,-6}},      color={191,0,0}));
-  connect(port_a, str.fluidPort[1]) annotation (Line(points={{-100,5.55112e-16},
-          {-100,0},{-72,0},{-72,-40},{-60,-40}}, color={0,127,255}));
-  connect(port_b, str.fluidPort[nSeg + 2]) annotation (Line(points={{100,
-          5.55112e-16},{100,0},{80,0},{80,-88},{-72,-88},{-72,-40},{-60,-40}},
+  connect(port_a, str.fluidPort[1]) annotation (Line(points={{0,100},{0,92},{
+          -72,92},{-72,-40},{-60,-40}},          color={0,127,255}));
+  connect(port_b, str.fluidPort[nSeg + 2]) annotation (Line(points={{0,-100},{
+          -72,-100},{-72,-40},{-60,-40}},
                            color={0,127,255}));
   connect(mTan_flow.y, str.m_flow) annotation (Line(points={{-73,-32},{-68.5,
           -32},{-68.5,-31.8},{-62,-31.8}}, color={0,0,127}));
diff --git a/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo b/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo
index 6d8e5c7e71..be6ea0535a 100644
--- a/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo
+++ b/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo
@@ -95,13 +95,13 @@ model StratifiedEnhancedInternalHex
     redeclare final package Medium =MediumHex,
      m_flow(min=if allowFlowReversalHex then -Modelica.Constants.inf else 0))
     "Heat exchanger inlet"
-   annotation (Placement(transformation(extent={{-110,-48},{-90,-28}}),
+   annotation (Placement(transformation(extent={{-150,-30},{-130,-10}}),
                    iconTransformation(extent={{-110,-48},{-90,-28}})));
   Modelica.Fluid.Interfaces.FluidPort_b portHex_b(
      redeclare final package Medium = MediumHex,
      m_flow(max=if allowFlowReversalHex then Modelica.Constants.inf else 0))
     "Heat exchanger outlet"
-   annotation (Placement(transformation(extent={{-110,-90},{-90,-70}}),
+   annotation (Placement(transformation(extent={{-150,-90},{-130,-70}}),
         iconTransformation(extent={{-110,-90},{-90,-70}})));
 
   BaseClasses.IndirectTankHeatExchanger indTanHex(
@@ -126,11 +126,10 @@ model StratifiedEnhancedInternalHex
     final allowFlowReversal=allowFlowReversalHex,
     final m_flow_small=1e-4*abs(mHex_flow_nominal))
     "Heat exchanger inside the tank"
-     annotation (Placement(
-        transformation(
-        extent={{-10,-15},{10,15}},
+     annotation (Placement(transformation(
+        extent={{10,-15},{-10,15}},
         rotation=180,
-        origin={-87,32})));
+        origin={-120,-20})));
 
   Modelica.Units.SI.HeatFlowRate QHex_flow=-sum(indTanHex.port.Q_flow)
     "Heat transferred from the heat exchanger to the tank";
@@ -173,17 +172,17 @@ equation
     for i in 1:hexSegMult loop
       connect(indTanHex.port[j*hexSegMult+i], heaPorVol[segHex_a + (if hHex_a > hHex_b then j else -j)])
         annotation (Line(
-       points={{-87,41.8},{-20,41.8},{-20,-2.22045e-16},{0,-2.22045e-16}},
+       points={{-120,-10.2},{-120,0},{0,0}},
        color={191,0,0},
        smooth=Smooth.None));
     end for;
   end for;
   connect(portHex_a, indTanHex.port_a) annotation (Line(
-      points={{-100,-38},{-68,-38},{-68,32},{-77,32}},
+      points={{-140,-20},{-130,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(indTanHex.port_b, portHex_b) annotation (Line(
-      points={{-97,32},{-98,32},{-98,18},{-70,18},{-70,-80},{-100,-80}},
+      points={{-110,-20},{-100,-20},{-100,-80},{-140,-80}},
       color={0,127,255},
       smooth=Smooth.None));
 
@@ -337,5 +336,6 @@ January 29, 2013 by Peter Grant:<br/>
 First implementation.
 </li>
 </ul>
-</html>"));
+</html>"),
+    Diagram(coordinateSystem(extent={{-140,-100},{100,100}})));
 end StratifiedEnhancedInternalHex;