diff --git a/PROMS/Formats/fmtall/AEP_00all.xml b/PROMS/Formats/fmtall/AEP_00all.xml
index df3f95d1..31bbd389 100644
Binary files a/PROMS/Formats/fmtall/AEP_00all.xml and b/PROMS/Formats/fmtall/AEP_00all.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
index ac19bf9f..151c606a 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
@@ -1094,7 +1094,10 @@ namespace VEPROMS.CSLA.Library
 		}
 		private static bool AddPageNumber(TransitionBuilder tb)
 		{
-			if (tb._ToItem.PageNumber != 0 && tb._FromItem.PageNumber != 0)
+			//At some point, add a property off a section 'IsFoldout' and use the next two lines:
+			//if ((myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && mySection.MyContent.Number.ToUpper() == "FOLDOUT")
+			//|| (myProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && mySection.MyContent.Text.ToUpper().Contains("FOLDOUT")))
+			if (tb._ToItem.PageNumber != 0 && (tb._FromItem.PageNumber != 0 || tb._FromItem.ActiveSection.MyContent.Number.ToUpper() == "FOLDOUT"))  
 			{
 				int pgoffset = tb._ToItem.PageNumber - tb._FromItem.PageNumber;
 				tb._ToItem.PageNumberUsed = tb._ToItem.PageNumber;
diff --git a/PROMS/Volian.Print.Library/vlnBox.cs b/PROMS/Volian.Print.Library/vlnBox.cs
index f4b62fcd..18933e63 100644
--- a/PROMS/Volian.Print.Library/vlnBox.cs
+++ b/PROMS/Volian.Print.Library/vlnBox.cs
@@ -112,7 +112,17 @@ namespace Volian.Print.Library
 			if (DefBox != null && DefBox != vlnBox.DOUBLEboxHLS)
 			{
 				cb.SetLineWidth(.6F);
-				cb.Rectangle(left, bottom, right - left, Height * MyPageHelper.YMultiplier);
+				float lheight = Height;
+				if (top > yTopMargin)
+				{
+					lheight -= (top - yTopMargin);
+				}
+				if (bottom < yBottomMargin)
+				{
+					lheight += (bottom - yBottomMargin);
+					bottom = yBottomMargin;
+				}
+				cb.Rectangle(left, bottom, right - left, lheight * MyPageHelper.YMultiplier);
 			}
 			else if (DefBox == vlnBox.DOUBLEboxHLS)
 			{