diff --git a/interface/src/Application.h b/interface/src/Application.h
index fd2d6f2dfa..284e475d2f 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -14,14 +14,14 @@
 
 #include <QApplication>
 #include <QAction>
-#include <QImage>
-#include <QSettings>
-#include <QTouchEvent>
-#include <QList>
-#include <QSet>
-#include <QStringList>
-#include <QPointer>
 #include <QHash>
+#include <QImage>
+#include <QList>
+#include <QPointer>
+#include <QSet>
+#include <QSettings>
+#include <QStringList>
+#include <QTouchEvent>
 
 #include <NetworkPacket.h>
 #include <NodeList.h>
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 56d5e5fd6f..3726bcd9a1 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -219,65 +219,65 @@ private:
 namespace MenuOption {
     const QString AboutApp = "About Interface";
     const QString AmbientOcclusion = "Ambient Occlusion";
-    const QString Avatars = "Avatars";
     const QString Atmosphere = "Atmosphere";
-    const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";
+    const QString AudioNoiseReduction = "Audio Noise Reduction";
+    const QString AudioToneInjection = "Inject Test Tone";
+    const QString Avatars = "Avatars";
     const QString Bandwidth = "Bandwidth Display";
     const QString BandwidthDetails = "Bandwidth Details";
     const QString BuckyBalls = "Bucky Balls";
+    const QString Chat = "Chat...";
     const QString ChatCircling = "Chat Circling";
-    const QString Collisions = "Collisions";
     const QString CollideWithAvatars = "Collide With Avatars";
+    const QString CollideWithEnvironment = "Collide With World Boundaries";
     const QString CollideWithParticles = "Collide With Particles";
     const QString CollideWithVoxels = "Collide With Voxels";
-    const QString CollideWithEnvironment = "Collide With World Boundaries";
+    const QString Collisions = "Collisions";
     const QString CullSharedFaces = "Cull Shared Voxel Faces";
     const QString DecreaseAvatarSize = "Decrease Avatar Size";
     const QString DecreaseVoxelSize = "Decrease Voxel Size";
+    const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";
     const QString DisplayFrustum = "Display Frustum";
     const QString DisplayHands = "Display Hands";
     const QString DisplayHandTargets = "Display Hand Targets";
-    const QString FilterSixense = "Smooth Sixense Movement";
-    const QString Enable3DTVMode = "Enable 3DTV Mode";
-    const QString AudioNoiseReduction = "Audio Noise Reduction";
-    const QString AudioToneInjection = "Inject Test Tone";
-    const QString EchoServerAudio = "Echo Server Audio";
-    const QString EchoLocalAudio = "Echo Local Audio";
-    const QString MuteAudio = "Mute Microphone";
     const QString DontFadeOnVoxelServerChanges = "Don't Fade In/Out on Voxel Server Changes";
-    const QString HeadMouse = "Head Mouse";
-    const QString HandsCollideWithSelf = "Collide With Self";
+    const QString EchoLocalAudio = "Echo Local Audio";
+    const QString EchoServerAudio = "Echo Server Audio";
+    const QString Enable3DTVMode = "Enable 3DTV Mode";
     const QString Faceshift = "Faceshift";
+    const QString FilterSixense = "Smooth Sixense Movement";
     const QString FirstPerson = "First Person";
     const QString FrameTimer = "Show Timer";
     const QString FrustumRenderMode = "Render Mode";
     const QString Fullscreen = "Fullscreen";
     const QString FullscreenMirror = "Fullscreen Mirror";
     const QString GlowMode = "Cycle Glow Mode";
+    const QString GoHome = "Go Home";
+    const QString GoTo = "Go To...";
     const QString GoToDomain = "Go To Domain...";
     const QString GoToLocation = "Go To Location...";
-    const QString NameLocation = "Name this location";
-    const QString GoTo = "Go To...";
+    const QString Gravity = "Use Gravity";
+    const QString HandsCollideWithSelf = "Collide With Self";
+    const QString HeadMouse = "Head Mouse";
     const QString IncreaseAvatarSize = "Increase Avatar Size";
     const QString IncreaseVoxelSize = "Increase Voxel Size";
-    const QString GoHome = "Go Home";
-    const QString Gravity = "Use Gravity";
+    const QString LoadScript = "Open and Run Script File...";
+    const QString LoadScriptURL = "Open and Run Script from URL...";
     const QString LodTools = "LOD Tools";
     const QString Log = "Log";
     const QString Login = "Login";
     const QString Logout = "Logout";
     const QString LookAtVectors = "Look-at Vectors";
     const QString MetavoxelEditor = "Metavoxel Editor...";
-    const QString Chat = "Chat...";
     const QString Metavoxels = "Metavoxels";
     const QString Mirror = "Mirror";
     const QString MoveWithLean = "Move with Lean";
+    const QString MuteAudio = "Mute Microphone";
+    const QString NameLocation = "Name this location";
     const QString NewVoxelCullingMode = "New Voxel Culling Mode";
+    const QString OctreeStats = "Voxel and Particle Statistics";
     const QString OffAxisProjection = "Off-Axis Projection";
     const QString OldVoxelCullingMode = "Old Voxel Culling Mode";
-    const QString TurnWithHead = "Turn using Head";
-    const QString LoadScript = "Open and Run Script File...";
-    const QString LoadScriptURL = "Open and Run Script from URL...";
     const QString Oscilloscope = "Audio Oscilloscope";
     const QString Pair = "Pair";
     const QString Particles = "Particles";
@@ -285,30 +285,30 @@ namespace MenuOption {
     const QString PipelineWarnings = "Show Render Pipeline Warnings";
     const QString PlaySlaps = "Play Slaps";
     const QString Preferences = "Preferences...";
+    const QString Quit =  "Quit";
     const QString ReloadAllScripts = "Reload All Scripts";
-    const QString RenderSkeletonCollisionShapes = "Skeleton Collision Shapes";
-    const QString RenderHeadCollisionShapes = "Head Collision Shapes";
     const QString RenderBoundingCollisionShapes = "Bounding Collision Shapes";
+    const QString RenderHeadCollisionShapes = "Head Collision Shapes";
+    const QString RenderSkeletonCollisionShapes = "Skeleton Collision Shapes";
     const QString ResetAvatarSize = "Reset Avatar Size";
     const QString RunningScripts = "Running Scripts";
     const QString RunTimingTests = "Run Timing Tests";
+    const QString SettingsExport = "Export Settings";
     const QString SettingsImport = "Import Settings";
     const QString Shadows = "Shadows";
-    const QString SettingsExport = "Export Settings";
     const QString ShowCulledSharedFaces = "Show Culled Shared Voxel Faces";
-    const QString SuppressShortTimings = "Suppress Timings Less than 10ms";
     const QString Stars = "Stars";
     const QString Stats = "Stats";
     const QString StopAllScripts = "Stop All Scripts";
+    const QString SuppressShortTimings = "Suppress Timings Less than 10ms";
     const QString TestPing = "Test Ping";
     const QString TransmitterDrive = "Transmitter Drive";
+    const QString TurnWithHead = "Turn using Head";
     const QString UploadHead = "Upload Head Model";
     const QString UploadSkeleton = "Upload Skeleton Model";
     const QString Visage = "Visage";
-    const QString Quit =  "Quit";
-    const QString Voxels = "Voxels";
     const QString VoxelMode = "Cycle Voxel Mode";
-    const QString OctreeStats = "Voxel and Particle Statistics";
+    const QString Voxels = "Voxels";
     const QString VoxelTextures = "Voxel Textures";
 }