diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
index 2a710b22794..0c7bd05d721 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
@@ -170,7 +170,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 	}
 
 	/**
-	 * Returns the provider equal to provider at the point from which editing started. 
+	 * Returns the provider equal to provider at the point from which editing started.
 	 * Used by option pages when there is a need.
 	 * @param id - id of the provider.
 	 *
@@ -529,6 +529,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 	 */
 	private void createProjectStorageCheckBox(Composite parent) {
 		projectStorageCheckBox = new Button(parent, SWT.CHECK);
+		projectStorageCheckBox.setLayoutData(new GridData(SWT.END, SWT.NONE, false, false));
 		projectStorageCheckBox.setText(Messages.LanguageSettingsProviderTab_StoreEntriesInsideProject);
 		projectStorageCheckBox.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -582,7 +583,14 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 			createLinkToPreferences(groupOptionsPage, 2);
 		}
 
-		compositeOptionsPage = new Composite(groupOptionsPage, SWT.NONE);
+		// composite to span over 2 columns
+		Composite comp = new Composite(groupOptionsPage, SWT.NONE);
+		comp.setLayout(new GridLayout());
+		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+		gd.horizontalSpan = 2;
+		comp.setLayoutData(gd);
+
+		compositeOptionsPage = new Composite(comp, SWT.NONE);
 		compositeOptionsPage.setLayout(new TabFolderLayout());
 	}
 
@@ -961,6 +969,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 			optionsPage.setContainer(page);
 			optionsPage.createControl(compositeOptionsPage);
 			optionsPage.setVisible(false);
+			compositeOptionsPage.setBounds(compositeOptionsPage.getParent().getClientArea());
 			compositeOptionsPage.layout(true);
 		}
 	}
@@ -1006,6 +1015,8 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 			boolean isEditable = isEditableForProject || isEditableForPrefs;
 			currentOptionsPage.getControl().setEnabled(isEditable);
 			compositeOptionsPage.setEnabled(isEditable);
+			compositeOptionsPage.setBounds(compositeOptionsPage.getParent().getClientArea());
+			compositeOptionsPage.layout(true);
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties
index ad4c41fa34c..73eebb342a8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties
@@ -202,7 +202,7 @@ LanguageSettingsProviderTab_ProviderOptions=Language Settings Provider Options
 LanguageSettingsProviderTab_SettingEntries=Setting Entries
 LanguageSettingsProviderTab_SettingEntriesTooltip=Setting Entries
 LanguageSettingsProviderTab_ShareProviders=Share setting entries between projects (global provider)
-LanguageSettingsProviderTab_StoreEntriesInsideProject=Store entries in project settings folder (easing project miration)
+LanguageSettingsProviderTab_StoreEntriesInsideProject=Store entries in project settings folder (easing project migration)
 LanguageSettingsProviderTab_TitleResetProviders=Reset Language Settings Providers
 LanguageSettingsProviderTab_WorkspaceSettings=Workspace Settings