Removed the csproj because it's too much headache.
Removed the csproj because it's too much headache.

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="xcopy /Y ${ProjectDir}\bin\Debug\*.dll ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" workingdir="${ProjectDir}" externalConsole="True" />
-      </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="xcopy /Y ${ProjectDir}\bin\Release\*.dll ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" workingdir="${ProjectDir}" externalConsole="True" />
-      </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>..\..\..\Games\KSP_win\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\Games\KSP_win\KSP_Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>..\..\..\Games\KSP_win\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_Core.cs
+++ b/VOID_Core.cs
@@ -68,7 +68,7 @@
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.9.12";
+		protected string VoidVersion = "0.9.13";
 
 		protected bool _factoryReset = false;
 

--- 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
@@ -59,13 +61,6 @@
 			}
 		}
 
-		public string ValueUnitString {
-			get {
-				return this.Value.ToString() + this.Units;
-			}
-		}
-
-
 		/*
 		 * Methods
 		 * */
@@ -88,12 +83,16 @@
 			return (T)this.cache;
 		}
 
+		public string ValueUnitString() {
+			return this.Value.ToString() + this.Units;
+		}
+
 		public virtual void DoGUIHorizontal()
 		{
 			GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
 			GUILayout.Label (this.Label + ":");
 			GUILayout.FlexibleSpace ();
-			GUILayout.Label (this.ValueUnitString, GUILayout.ExpandWidth (false));
+			GUILayout.Label (this.ValueUnitString(), GUILayout.ExpandWidth (false));
 			GUILayout.EndHorizontal ();
 		}
 
@@ -121,15 +120,24 @@
 		public abstract string ToString(string Format);
 		public abstract string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue);
 
-		public ushort DoGUIHorizontal(ushort digits)
+		public abstract string ValueUnitString(string format);
+		public abstract string ValueUnitString(ushort digits);
+
+		public virtual void DoGUIHorizontal(string format)
+		{
+			GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
+			GUILayout.Label (this.Label + ":");
+			GUILayout.FlexibleSpace ();
+			GUILayout.Label (this.ValueUnitString(format), GUILayout.ExpandWidth (false));
+			GUILayout.EndHorizontal ();
+		}
+
+		public virtual ushort DoGUIHorizontal(ushort digits)
 		{
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
 			GUILayout.FlexibleSpace();
-			GUILayout.Label(
-				this.ToSIString(digits),
-				GUILayout.ExpandWidth(false)
-			);
+			GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
 			if (GUILayout.Button ("P")) {
 				digits = (ushort)((digits + 3) % 15);
 			}
@@ -137,10 +145,6 @@
 
 			return digits;
 		}
-		public override void DoGUIHorizontal ()
-		{
-			this.DoGUIHorizontal (3);
-		}
 	}
 
 	public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
@@ -155,6 +159,14 @@
 				this.Value.ToString (format),
 				this.Units
 			);
+		}
+
+		public override string ValueUnitString(string format) {
+			return this.Value.ToString(format) + this.Units;
+		}
+
+		public override string ValueUnitString(ushort digits) {
+			return Tools.MuMech_ToSI(this.Value, digits) + this.Units;
 		}
 
 		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
@@ -169,6 +181,14 @@
 	public class VOID_FloatValue : VOID_NumValue<float>, IVOID_NumericValue
 	{
 		public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
+		
+		public override string ValueUnitString(string format) {
+			return this.Value.ToString(format) + this.Units;
+		}
+
+		public override string ValueUnitString(ushort digits) {
+			return Tools.MuMech_ToSI((double)this.Value, digits) + this.Units;
+		}
 
 		public override string ToString(string format)
 		{
@@ -192,6 +212,14 @@
 	public class VOID_IntValue : VOID_NumValue<int>, IVOID_NumericValue
 	{
 		public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
+		
+		public override string ValueUnitString(string format) {
+			return this.Value.ToString(format) + this.Units;
+		}
+
+		public override string ValueUnitString(ushort digits) {
+			return Tools.MuMech_ToSI((double)this.Value, digits) + this.Units;
+		}
 
 		public override string ToString(string format)
 		{
@@ -216,7 +244,7 @@
 
 	public class VOID_StrValue : VOID_DataValue<string>
 	{
-		public VOID_StrValue(string Label, Func<string> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
+		public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
 	}
 }
 

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -101,7 +101,8 @@
 					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToAp) +
 					"\nPe: " + Tools.MuMech_ToSI (vessel.orbit.PeA) + "m" +
 					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
-					"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°",
+					"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
+					"\nPrimary: " + vessel.mainBody.bodyName,
 					labelStyle);
 				// Toadicus edit: Added "Biome: " line to surf/atmo HUD
 				GUI.Label (

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -34,35 +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"
-		                                         );
-		protected double orbitApoAlt;
-		protected double oribtPeriAlt;
-		protected string timeToApo;
-		protected string timeToPeri;
-		protected double orbitInclination;
-		protected double gravityAccel;
-		protected string orbitPeriod;
-		protected double semiMajorAxis;
-		protected double eccentricity;
-		protected double meanAnomaly;
-		protected double trueAnomaly;
-		protected double eccAnomaly;
-		protected double longitudeAscNode;
-		protected double argumentPeriapsis;
-		protected double localSiderealLongitude;
+			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"
+		);
+
+		protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
+			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))
+		);
+
+		protected VOID_StrValue timeToPeri = new VOID_StrValue(
+			"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),
+			"°"
+		);
+
+		protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
+			"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²"
+		);
+
+		protected VOID_StrValue orbitPeriod = new VOID_StrValue(
+			"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"
+		);
+
+		protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
+			"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),
+			"°"
+		);
+
+		protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
+			"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),
+			"°"
+		);
+
+		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)),
+			"°"
+		);
 
 		public VOID_Orbital()
 		{
@@ -76,31 +156,6 @@
 		{
 			base.ModuleWindow (_);
 
-			if (VOID_Core.Instance.updateTimer >= this.lastUpdate + VOID_Core.Instance.updatePeriod)
-			{
-				this.lastUpdate = VOID_Core.Instance.updateTimer;
-
-				this.orbitApoAlt = vessel.orbit.ApA;
-				this.oribtPeriAlt = vessel.orbit.PeA;
-				this.timeToApo = Tools.ConvertInterval(vessel.orbit.timeToAp);
-				this.timeToPeri = Tools.ConvertInterval(vessel.orbit.timeToPe);
-				this.orbitInclination = vessel.orbit.inclination;
-
-				double orbitRadius = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
-				this.gravityAccel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(orbitRadius, 2);
-
-				this.orbitPeriod = Tools.ConvertInterval(vessel.orbit.period);
-				this.semiMajorAxis = vessel.orbit.semiMajorAxis;
-				this.eccentricity = vessel.orbit.eccentricity;
-				this.meanAnomaly = vessel.orbit.meanAnomaly * 180d / Math.PI;
-				this.trueAnomaly = vessel.orbit.trueAnomaly;
-				this.eccAnomaly = vessel.orbit.eccentricAnomaly * 180d / Math.PI;
-				this.longitudeAscNode = vessel.orbit.LAN;
-				this.argumentPeriapsis = vessel.orbit.argumentOfPeriapsis;
-				this.localSiderealLongitude =
-					Tools.FixDegreeDomain(vessel.longitude + vessel.orbit.referenceBody.rotationAngle);
-			}
-
 			int idx = 0;
 
             GUILayout.BeginVertical();
@@ -110,142 +165,46 @@
 			this.precisionValues [idx] = this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(VOIDLabels.void_velocity + ":");
-			GUILayout.FlexibleSpace();
-			GUILayout.Label(Tools.MuMech_ToSI(this.orbitVelocity, this.precisionValues [idx]) + "m/s", GUILayout.ExpandWidth(false));
-			
-			if (GUILayout.Button ("P")) {
-				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
-			}
-            GUILayout.EndHorizontal();
-			idx++;
-
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(VOIDLabels.void_apoapsis + ":");
-			GUILayout.FlexibleSpace();
-			GUILayout.Label(Tools.MuMech_ToSI(this.orbitApoAlt, this.precisionValues [idx]) + "m", GUILayout.ExpandWidth(false));
-			
-			if (GUILayout.Button ("P")) {
-				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
-			}
-            GUILayout.EndHorizontal();
-			idx++;
-
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Time to Ap:");
-			GUILayout.FlexibleSpace();
-			GUILayout.Label(this.timeToApo, GUILayout.ExpandWidth(false));
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(VOIDLabels.void_periapsis + ":");
-			GUILayout.FlexibleSpace();
-			GUILayout.Label(
-				Tools.MuMech_ToSI(this.oribtPeriAlt, this.precisionValues [idx]) + "m",
-				GUILayout.ExpandWidth(false)
-				);
-			
-			if (GUILayout.Button ("P")) {
-				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
-			}
-            GUILayout.EndHorizontal();
-			idx++;
-
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Time to Pe:");
-			GUILayout.FlexibleSpace();
-            GUILayout.Label(this.timeToPeri, GUILayout.ExpandWidth(false));
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Inclination:");
-			GUILayout.FlexibleSpace();
-            GUILayout.Label(this.orbitInclination.ToString("F3") + "°", GUILayout.ExpandWidth(false));
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Gravity:");
-			GUILayout.FlexibleSpace();
-			GUILayout.Label(
-				Tools.MuMech_ToSI(gravityAccel, this.precisionValues[idx]) + "m/s²",
-				GUILayout.ExpandWidth(false)
-				);
-			
-			if (GUILayout.Button ("P")) {
-				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
-			}
-            GUILayout.EndHorizontal();
+			this.precisionValues [idx] = this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.precisionValues [idx] = this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.timeToApo.DoGUIHorizontal();
+
+			this.precisionValues [idx] = this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.timeToPeri.DoGUIHorizontal();
+
+			this.orbitInclination.DoGUIHorizontal("F3");
+
+			this.precisionValues [idx] = this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
 			this.toggleExtended = GUILayout.Toggle(this.toggleExtended, "Extended info");
 
 			if (this.toggleExtended)
             {
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Period:");
-				GUILayout.FlexibleSpace();
-                GUILayout.Label(this.orbitPeriod, GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Semi-major axis:");
-				GUILayout.FlexibleSpace();
-				GUILayout.Label(
-					Tools.MuMech_ToSI(this.semiMajorAxis, this.precisionValues [idx]) + "m",
-					GUILayout.ExpandWidth(false)
-					);
-				
-				if (GUILayout.Button ("P")) {
-					this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
-				}
-                GUILayout.EndHorizontal();
+				this.orbitPeriod.DoGUIHorizontal();
+
+				this.precisionValues [idx] = this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
 				idx++;
 
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Eccentricity:");
-				GUILayout.FlexibleSpace();
-				GUILayout.Label(this.eccentricity.ToString("F4"), GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-				// Toadicus edit: convert mean anomaly into degrees.
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Mean anomaly:");
-				GUILayout.FlexibleSpace();
-                GUILayout.Label(this.meanAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("True anomaly:");
-				GUILayout.FlexibleSpace();
-				GUILayout.Label(this.trueAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-				// Toadicus edit: convert eccentric anomaly into degrees.
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Eccentric anomaly:");
-				GUILayout.FlexibleSpace();
-                GUILayout.Label(this.eccAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Long. ascending node:");
-				GUILayout.FlexibleSpace();
-                GUILayout.Label(this.longitudeAscNode.ToString("F3") + "°", GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Arg. of periapsis:");
-				GUILayout.FlexibleSpace();
-                GUILayout.Label(this.argumentPeriapsis.ToString("F3") + "°", GUILayout.ExpandWidth(false));
-                GUILayout.EndHorizontal();
-
-				// Toadicus edit: added local sidereal longitude.
-				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-				GUILayout.Label("Local Sidereal Longitude:");
-				GUILayout.FlexibleSpace();
-				GUILayout.Label(this.localSiderealLongitude.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
-				GUILayout.EndHorizontal();
+				this.eccentricity.DoGUIHorizontal("F4");
+
+				this.meanAnomaly.DoGUIHorizontal("F3");
+
+				this.trueAnomaly.DoGUIHorizontal("F3");
+
+				this.eccAnomaly.DoGUIHorizontal("F3");
+
+				this.longitudeAscNode.DoGUIHorizontal("F3");
+
+				this.argumentPeriapsis.DoGUIHorizontal("F3");
+
+				this.localSiderealLongitude.DoGUIHorizontal("F3");
             }
 
             GUILayout.EndVertical();