diff --git a/cross/org.eclipse.cdt.launch.remote/plugin.xml b/cross/org.eclipse.cdt.launch.remote/plugin.xml
index a89f8e996d1..6e13424aea1 100644
--- a/cross/org.eclipse.cdt.launch.remote/plugin.xml
+++ b/cross/org.eclipse.cdt.launch.remote/plugin.xml
@@ -39,67 +39,64 @@ Anna Dushistova  (Mentor Graphics) - code restructuring
    
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabs">
-     <tab
-            id="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"
-            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
-            name="Main"
-            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
+         
+      <!-- Run Remote application launch tabs-->    
+      <tab id="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"
+           group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
+           name="Main"
+           class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
-     </tab>         
-     <tab
-            id="org.eclipse.rse.remotecdt.dsf.gdb.mainTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
-            name="Main"
-            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
-        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
-     </tab>         
-     <tab
-            id="org.eclipse.rse.remotecdt.launch.CAgrumentsTab"
-            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
-            name="Arguments"
-            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
+      </tab>         
+      <tab id="org.eclipse.rse.remotecdt.launch.CAgrumentsTab"
+           group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
+           name="Arguments"
+           class="org.eclipse.cdt.launch.ui.CArgumentsTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
         <placement after="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"/>                        
       </tab>         
+      <tab id="org.eclipse.rse.remotecdt.launch.CommonTab"
+           group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
+           name="Common"
+           class="org.eclipse.debug.ui.CommonTab">
+        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
+        <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>        
+      </tab>         
+      
+      <!-- Debug Remote application launch tabs-->    
+      <tab id="org.eclipse.rse.remotecdt.dsf.gdb.mainTab"
+           group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+           name="Main"
+           class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
+        <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
+      </tab>         
       <tab id="org.eclipse.rse.remotecdt.dsf.debug.CArgumentsTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
-            name="Arguments"
-            class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
+           group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+           name="Arguments"
+           class="org.eclipse.cdt.dsf.gdb.internal.ui.launching.CArgumentsTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
         <placement after="org.eclipse.cdt.launch.remote.dsf.mainTab"/>
       </tab>
       <tab id="org.eclipse.rse.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
-            name="Debugger"
-            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFDebuggerTab">
+           group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+           name="Debugger"
+           class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFDebuggerTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
         <placement after="org.eclipse.cdt.dsf.gdb.launch.argumentsTab"/>
       </tab>
-      <tab
-            id="org.eclipse.rse.remotecdt.debug.dsf.SourceLookupTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
-            name="Source"
-            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
+      <tab id="org.eclipse.rse.remotecdt.debug.dsf.SourceLookupTab"
+           group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+           name="Source"
+           class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
         <placement after="org.eclipse.rse.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"/>        
       </tab>         
-      <tab
-            id="org.eclipse.rse.remotecdt.launch.CommonTab"
-            group="org.eclipse.cdt.launch.remoteApplicationRunLaunchTabGroup"
-            name="Common"
-            class="org.eclipse.debug.ui.CommonTab">
-        <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
-        <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>        
-      </tab>         
-      <tab
-            id="org.eclipse.rse.remotecdt.debug.dsf.CommonTab"
-            group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
-            name="Common"
-            class="org.eclipse.debug.ui.CommonTab">
+      <tab id="org.eclipse.rse.remotecdt.debug.dsf.CommonTab"
+           group="org.eclipse.cdt.launch.remoteApplicationLaunchTabGroup"
+           name="Common"
+           class="org.eclipse.debug.ui.CommonTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
         <placement after="org.eclipse.debug.ui.sourceLookupTab"/>                
       </tab>         
-      
    </extension>
    
 	<!-- ============================================ -->