VOID_VesselInfo: Converted to use VOID_DataValues.
VOID_VesselInfo: Converted to use VOID_DataValues.

file:a/VOID.csproj (deleted)
--- a/VOID.csproj
+++ /dev/null
@@ -1,97 +1,1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{45ACC1CC-942C-4A66-BFC7-8BE375938B18}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>VOID</RootNamespace>
-    <AssemblyName>VOID</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG; TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="AfterBuild" command="/usr/bin/cp -fv ${ProjectDir}/bin/Debug/VOID.dll /mnt/games/ssd/KSP_linux/GameData/VOID/Plugins/" />
-      </CustomCommands>
-    </CustomCommands>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <DefineConstants>TRACE</DefineConstants>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="AfterBuild" command="/usr/bin/cp -fv ${ProjectDir}/bin/Release/VOID.dll /mnt/games/ssd/KSP_linux/GameData/VOID/Plugins/" />
-      </CustomCommands>
-    </CustomCommands>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="Tools.cs" />
-    <Compile Include="IVOID_Module.cs" />
-    <Compile Include="VOIDFlightMaster.cs" />
-    <Compile Include="VOID_Core.cs" />
-    <Compile Include="VOID_Module.cs" />
-    <Compile Include="VOID_HUD.cs" />
-    <Compile Include="VOID_SaveValue.cs" />
-    <Compile Include="VOID_Orbital.cs" />
-    <Compile Include="VOID_SurfAtmo.cs" />
-    <Compile Include="VOID_VesselInfo.cs" />
-    <Compile Include="VOID_Transfer.cs" />
-    <Compile Include="VOID_CBInfoBrowser.cs" />
-    <Compile Include="VOID_Rendezvous.cs" />
-    <Compile Include="VOID_VesselRegister.cs" />
-    <Compile Include="VOID_DataLogger.cs" />
-    <Compile Include="VOID_EditorCore.cs" />
-    <Compile Include="VOID_EditorHUD.cs" />
-    <Compile Include="IntCollection.cs" />
-    <Compile Include="VOID_DataValue.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\..\mnt\games-ssd\KSP_linux\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\..\mnt\games-ssd\KSP_linux\KSP_Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>..\..\..\..\..\mnt\games-ssd\KSP_linux\KSP_Data\Managed\System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Engineer.Extensions\Engineer.Extensions.csproj">
-      <Project>{2FCF882B-0771-4649-8D04-81D7AA76A486}</Project>
-      <Name>Engineer.Extensions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\VesselSimulator\VesselSimulator.csproj">
-      <Project>{30FD6C0B-D36E-462F-B0FF-F0FAC9C666CF}</Project>
-      <Name>VesselSimulator</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <StandardHeader Text=" &#xA; ${FileName}&#xA; &#xA; Author:&#xA;      ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA; Copyright (c) ${Year} ${CopyrightHolder}&#xA;&#xA; This program is free software: you can redistribute it and/or modify&#xA; it under the terms of the GNU General Public License as published by&#xA; the Free Software Foundation, either version 3 of the License, or&#xA; (at your option) any later version.&#xA;&#xA; This program is distributed in the hope that it will be useful,&#xA; but WITHOUT ANY WARRANTY; without even the implied warranty of&#xA; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#xA; GNU General Public License for more details.&#xA;&#xA; You should have received a copy of the GNU General Public License&#xA; along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;." IncludeInNewFiles="True" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-</Project>
+

--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -26,6 +26,8 @@
 	public interface IVOID_DataValue
 	{
 		void Refresh();
+		string ValueUnitString();
+		void DoGUIHorizontal();
 	}
 
 	public class VOID_DataValue<T> : IVOID_DataValue
@@ -67,7 +69,6 @@
 			this.Label = Label;
 			this.Units = Units;
 			this.ValueFunc = ValueFunc;
-			this.cache = this.ValueFunc.Invoke ();
 		}
 
 		public void Refresh()
@@ -130,14 +131,18 @@
 			GUILayout.EndHorizontal ();
 		}
 
-		public virtual ushort DoGUIHorizontal(ushort digits)
+		public virtual ushort DoGUIHorizontal(ushort digits, bool precisionButton = true)
 		{
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
 			GUILayout.FlexibleSpace();
 			GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
-			if (GUILayout.Button ("P")) {
-				digits = (ushort)((digits + 3) % 15);
+			if (precisionButton)
+			{
+				if (GUILayout.Button ("P"))
+				{
+					digits = (ushort)((digits + 3) % 15);
+				}
 			}
 			GUILayout.EndHorizontal();
 

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -34,113 +34,115 @@
 		protected IntCollection precisionValues;
 
 		protected VOID_StrValue primaryName = new VOID_StrValue (
-			                                    VOIDLabels.void_primary,
-												new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
-		                                    );
+			VOIDLabels.void_primary,
+			new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
+		);
+
 		protected VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
-			                                         "Altitude (ASL)",
-			                                         new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
-			                                         "m"
-		                                         );
+			"Altitude (ASL)",
+			new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
+			"m"
+		);
+
 		protected VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
-			                                         VOIDLabels.void_velocity,
-			                                         new Func<double> 
-														(() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
-			                                         "m/s"
-		                                         );
+			VOIDLabels.void_velocity,
+			new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
+			"m/s"
+		);
+
 		protected VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
-		                                        VOIDLabels.void_apoapsis,
-		                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
-		                                        "m"
-	                                        );
+			VOIDLabels.void_apoapsis,
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
+			"m"
+		);
+
 		protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
-		                                         VOIDLabels.void_periapsis,
-		                                         new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
-		                                         "m"
-	                                         );
+			VOIDLabels.void_periapsis,
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
+			"m"
+		);
+
 		protected VOID_StrValue timeToApo = new VOID_StrValue(
-		                                   "Time to Apoapsis",
-		                                   new Func<string>(
-												() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp)
-										   )
-	                                   );
+		"Time to Apoapsis",
+			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+		);
 
 		protected VOID_StrValue timeToPeri = new VOID_StrValue(
-			                                  "Time to Apoapsis",
-			                                  new Func<string>(
-				                                  () => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe)
-			                                  )
-		                                  );
-
+			"Time to Apoapsis",
+			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+		);
 
 		protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
-			                                        "Inclination",
-			                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
-			                                        "°"
-		                                        );
+			"Inclination",
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
+			"°"
+		);
+
 		protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
-			                                        "Gravity",
-			                                        delegate()
-													{
-			double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
+			"Gravity",
+			delegate()
+			{
+				double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
 				VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
-														return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
-														Math.Pow(orbitRadius, 2);
-													},
-			                                        "m/s²"
-		                                        );
+				return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+				Math.Pow(orbitRadius, 2);
+			},
+			"m/s²"
+		);
+
 		protected VOID_StrValue orbitPeriod = new VOID_StrValue(
-		                                        "Period",
-												 new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
-	                                        );
+			"Period",
+			 new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+		);
 
 		protected VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
-			                                         "Semi-Major Axis",
-			                                         new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
-			                                         "m"
-		                                         );
+			"Semi-Major Axis",
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
+			"m"
+		);
+
 		protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
-			                                        "Eccentricity",
-			                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
-			                                        ""
-		                                        );
+			"Eccentricity",
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
+			""
+		);
 
 		protected VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
-												 "Mean Anomaly",
-												 new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
-												 "°"
-												);
+			"Mean Anomaly",
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
+			"°"
+		);
 
 		protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
-		                                        "True Anomaly",
-		                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
-		                                        "°"
-	                                        );
+			"True Anomaly",
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
+			"°"
+		);
 
 		protected VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
-		                                       "Eccentric Anomaly",
-		                                       new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
-		                                       "°"
-	                                       );
+		"Eccentric Anomaly",
+			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
+			"°"
+		);
 
 		protected VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
 			"Long. Ascending Node",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
 			"°"
-			);
+		);
 
 		protected VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
 			"Argument of Periapsis",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
 			"°"
-			);
+	    );
 
 		protected VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
-			  "Local Sidereal Longitude",
-			  new Func<double>(() => Tools.FixDegreeDomain(
-			      VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
-			  "°"
-			);
+			"Local Sidereal Longitude",
+			new Func<double>(() => Tools.FixDegreeDomain(
+				VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
+			"°"
+		);
 
 		public VOID_Orbital()
 		{

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -20,6 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using KSP;
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace VOID
@@ -29,7 +30,128 @@
 		[AVOID_SaveValue("toggleExtended")]
 		protected VOID_SaveValue<bool> toggleExtended = false;
 
-		public VOID_VesselInfo()
+		protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
+			"G-force",
+			new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
+			"gees"
+		);
+
+		protected VOID_IntValue partCount = new VOID_IntValue(
+			"Parts",
+			new Func<int>(() => VOID_Core.Instance.vessel.Parts.Count),
+			""
+		);
+
+		protected VOID_DoubleValue totalMass = new VOID_DoubleValue(
+			"Total Mass",
+			new Func<double>(() => VOID_Core.Instance.vessel.GetTotalMass()),
+			"tons"
+		);
+
+		protected VOID_DoubleValue resourceMass = new VOID_DoubleValue(
+			"Resource Mass",
+			delegate()
+			{
+				double rscMass = 0;
+				foreach (Part part in VOID_Core.Instance.vessel.Parts)
+				{
+					rscMass += part.GetResourceMass();
+				}
+				return rscMass;
+			},
+			"tons"
+		);
+
+		protected VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
+			"DeltaV (Current Stage)",
+			delegate()
+			{
+				if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+					return double.NaN;
+				return Engineer.VesselSimulator.SimManager.Instance.Stages[Staging.lastStage].deltaV;
+			},
+			"m/s"
+		);
+
+		protected VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
+			"DeltaV (Total)",
+			delegate()
+			{
+				if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+					return double.NaN;
+				return Engineer.VesselSimulator.SimManager.Instance.LastStage.totalDeltaV;
+			},
+			"m/s"
+		);
+
+		protected VOID_FloatValue mainThrottle = new VOID_FloatValue(
+			"Throttle",
+			new Func<float>(() => VOID_Core.Instance.vessel.ctrlState.mainThrottle * 100f),
+			"%"
+		);
+
+		protected VOID_StrValue currmaxThrust = new VOID_StrValue(
+			"Thrust (curr/max)",
+			delegate()
+			{
+				if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+					return "N/A";
+
+				double currThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.actualThrust;
+				double maxThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.thrust;
+
+				return string.Format(
+					"{0} / {1}",
+					currThrust.ToString("F1"),
+					maxThrust.ToString("F1")
+				);
+			}
+		);
+
+		protected VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
+			"T:W (curr/max)",
+			delegate()
+			{
+				if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+					return "N/A";
+
+				double currThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.actualThrust;
+				double maxThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.thrust;
+				double mass = VOID_Core.Instance.vessel.GetTotalMass();
+				double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+				                 Math.Pow(
+					                 VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
+					                 2
+					                );
+				double weight = mass * gravity;
+
+				return string.Format(
+					"{0} / {1}",
+					(currThrust / weight).ToString("F2"),
+					(maxThrust / weight).ToString("F2")
+				);
+			}
+		);
+
+		protected VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
+			"Max T:W @ surface",
+			delegate()
+			{
+				if (Engineer.VesselSimulator.SimManager.Instance.Stages == null)
+					return double.NaN;
+
+				double maxThrust = Engineer.VesselSimulator.SimManager.Instance.LastStage.thrust;
+				double mass = VOID_Core.Instance.vessel.GetTotalMass();
+				double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+				                 Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+				double weight = mass * gravity;
+
+				return maxThrust / weight;
+			},
+			""
+		);
+
+		public VOID_VesselInfo() : base()
 		{
 			this._Name = "Vessel Information";
 
@@ -39,6 +161,8 @@
 
 		public override void ModuleWindow(int _)
 		{
+			base.ModuleWindow (_);
+
 			if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
 			{
 				Engineer.VesselSimulator.SimManager.Instance.RequestSimulation();
@@ -53,102 +177,31 @@
 				VOID_Core.Instance.LabelStyles["center_bold"],
 				GUILayout.ExpandWidth(true));
 
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("G-force:");
-			GUILayout.Label(vessel.geeForce.ToString("F2") + " gees", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			int num_parts = 0;
-			double total_mass = vessel.GetTotalMass();
-			double resource_mass = 0;
-			double max_thrust = 0;
-			double final_thrust = 0;
-
-			foreach (Part p in vessel.parts)
-			{
-			    num_parts++;
-			    resource_mass += p.GetResourceMass();
-
-			    foreach (PartModule pm in p.Modules)
-			    {
-			        if ((pm.moduleName == "ModuleEngines") &&
-						((p.State == PartStates.ACTIVE) ||
-							((Staging.CurrentStage > Staging.lastStage) && (p.inverseStage == Staging.lastStage)))
-					)
-			        {
-			            max_thrust += ((ModuleEngines)pm).maxThrust;
-			            final_thrust += ((ModuleEngines)pm).finalThrust;
-			        }
-			    }
-			}
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Parts:");
-			GUILayout.Label(num_parts.ToString("F0"), GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Total mass:");
-			GUILayout.Label(total_mass.ToString("F1") + " tons", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Resource mass:");
-			GUILayout.Label(resource_mass.ToString("F1") + " tons", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			if (stages.Length > Staging.lastStage)
-			{
-				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("DeltaV (Current Stage):");
-				GUILayout.Label(
-					Tools.MuMech_ToSI(stages[Staging.lastStage].deltaV).ToString() + "m/s",
-					GUILayout.ExpandWidth(false));
-				GUILayout.EndHorizontal();
-			}
-
-			if (stages.Length > 0)
-			{
-				double totalDeltaV = 0d;
-
-				for (int i = 0; i < stages.Length; ++i)
-				{
-					totalDeltaV += stages [i].deltaV;
+			this.geeForce.DoGUIHorizontal ("F2");
+
+			this.partCount.DoGUIHorizontal ();
+
+			this.totalMass.DoGUIHorizontal ("F1");
+
+			this.resourceMass.DoGUIHorizontal ("F1");
+
+			if (stages != null) {
+				if (stages.Length > Staging.lastStage) {
+					this.stageDeltaV.DoGUIHorizontal (3, false);
 				}
 
-				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("DeltaV (Total):");
-				GUILayout.Label(Tools.MuMech_ToSI(totalDeltaV).ToString() + "m/s", GUILayout.ExpandWidth(false));
-				GUILayout.EndHorizontal();
-			}
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Throttle:");
-			GUILayout.Label((vessel.ctrlState.mainThrottle * 100f).ToString("F0") + "%", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Thrust (curr/max):");
-			GUILayout.Label(
-				final_thrust.ToString("F1") +
-				" / " + max_thrust.ToString("F1") + " kN",
-				GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			double gravity = vessel.mainBody.gravParameter / Math.Pow(vessel.mainBody.Radius + vessel.altitude, 2);
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("T:W (curr/max):");
-			GUILayout.Label(
-				(final_thrust / (total_mass * gravity)).ToString("F2") +
-				" / " + (max_thrust / (total_mass * gravity)).ToString("F2"),
-				GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-
-			double g_ASL = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(vessel.mainBody.Radius, 2);
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Max T:W @ surface:");
-			GUILayout.Label((max_thrust / (total_mass * g_ASL)).ToString("F2"), GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
+				if (stages.Length > 0) {
+					this.totalDeltaV.DoGUIHorizontal (3, false);
+				}
+			}
+
+			this.mainThrottle.DoGUIHorizontal ("F0");
+
+			this.currmaxThrust.DoGUIHorizontal ();
+
+			this.currmaxThrustWeight.DoGUIHorizontal ();
+
+			this.surfaceThrustWeight.DoGUIHorizontal ("F2");
 
 			GUILayout.EndVertical();
 			GUI.DragWindow();