diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
index 6616d55b7b..1b57b2092e 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
@@ -137,10 +137,11 @@
 						Content="..."
 						Command="{Binding ChangeOutputPath}"></Button>
 					<!-- Documentfile missing and only partial implemented -->
-					<optionpanels:StorageLocationPicker
-						Grid.Row="2"
-						Location="{Binding DocumentationFile.Location}"
-						DockPanel.Dock="Left" />
+					<!-- ??????? -->
+					
+					<optionpanels:StorageLocationPicker Grid.Row="2" DockPanel.Dock="Left"
+						Location="{Binding DocumentationFile.Location}"/>
+						
 					<CheckBox
 						x:Name="xmlDocumentationCheckBox"
 						Grid.Row="2"
@@ -164,42 +165,35 @@
 						Grid.Column="1"
 						HorizontalAlignment="Right"
 						Content="{core:Localize Dialog.ProjectOptions.Build.DebugInfo}"></Label>
-					<!--Combo Save etc missing -->
+				
 					<ComboBox
 						Grid.Row="3"
 						Grid.Column="2"
 						Width="150"
 						HorizontalAlignment="Left"
 						SelectedIndex="1"
+						SelectedValue="{Binding Path=DebugType.Value}"
 						gui:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
 					<Label
 						Grid.Row="4"
 						Grid.Column="1"
 						HorizontalAlignment="Right"
 						Content="{core:Localize Dialog.ProjectOptions.Build.TargetFramework}"></Label>
-					<StackPanel
-						Orientation="Horizontal"
-						Grid.Row="4"
-						Grid.Column="2">
+					<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2">
 						<ComboBox
 							x:Name="targetFrameworkComboBox"
 							Width="200"
 							Margin="0,0,3,0"
 							IsEnabled="False"></ComboBox>
-						<!-- Save etc missing -->
 						<Button
 							Width="100"
 							Content="Change"
 							Command="{Binding UpdateProjectCommand}"
 							Margin="3,0,3,0"></Button>
 					</StackPanel>
-					<GroupBox
-						Grid.Row="5"
-						Grid.ColumnSpan="3"
-						Margin="5,10,0,0"
+					<GroupBox Grid.Row="5" Grid.ColumnSpan="3" Margin="5,10,0,0"
 						Header="{core:Localize Dialog.ProjectOptions.Build.Advanced}">
-						<Grid
-							ShowGridLines="True">
+						<Grid>
 							<Grid.RowDefinitions>
 								<RowDefinition
 									Height="25"></RowDefinition>
@@ -241,11 +235,13 @@
 								Grid.Column="1"
 								HorizontalAlignment="Right"
 								Content="{core:Localize Dialog.ProjectOptions.Build.GenerateSerializationAssembly}"></Label>
+							
 							<ComboBox
 								x:Name="generateSerializationAssemblyComboBox"
 								Grid.Row="1"
 								Grid.Column="2"
 								ItemsSource="{Binding Path=DataContext.SerializationInfo}"
+								SelectedValue="{Binding Path=GenerateSerializationAssemblies.Value}"
 								DisplayMemberPath="DisplayValue"
 								SelectedValuePath="Key"
 								SelectedIndex="2"></ComboBox>
@@ -258,11 +254,14 @@
 								Grid.Column="1"
 								HorizontalAlignment="Right"
 								Content="{core:Localize Dialog.ProjectOptions.Build.TargetCPU}"></Label>
+							
+							
 							<ComboBox
 								x:Name="targetCpuComboBox"
 								Grid.Row="2"
 								Grid.Column="2"
 								ItemsSource="{Binding Path=DataContext.TargetCPU}"
+								SelectedValue="{Binding Path=PlatformTarget.Value}"
 								DisplayMemberPath="DisplayValue"
 								SelectedValuePath="Key"
 								SelectedIndex="1"></ComboBox>
@@ -271,14 +270,13 @@
 								Grid.Column="1"
 								HorizontalAlignment="Right"
 								Content="{core:Localize Dialog.ProjectOptions.Build.FileAlignment}"></Label>
-							<!-- ????? -->
 							
 							<ComboBox
 								x:Name="fileAlignmentComboBox"
 								Grid.Row="3"
 								Grid.Column="2"
 								ItemsSource="{Binding Path=DataContext.FileAlign}"
-								SelectedValue="{Binding Path=SelectedFileAlign}"
+								SelectedValue="{Binding Path=FileAlignment.Value}"
 								DisplayMemberPath="DisplayValue"
 								SelectedValuePath="Key"
 								SelectedIndex="3"></ComboBox>
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
index e62016ca74..d9e16506e3 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
@@ -48,10 +48,6 @@ namespace CSharpBinding.OptionPanels
 		public BuildOptionsXaml()
 		{
 			InitializeComponent();
-		}
-		
-		private void Initialize()
-		{
 			this.serializationInfo = new List<KeyItemPair>();
 			
 			this.serializationInfo.Add (new KeyItemPair("Off",StringParser.Parse("${res:Dialog.ProjectOptions.Build.Off}")));
@@ -64,7 +60,6 @@ namespace CSharpBinding.OptionPanels
 			this.targetCPU.Add(new KeyItemPair( "x86",StringParser.Parse("${res:Dialog.ProjectOptions.Build.TargetCPU.x86}")));
 			this.targetCPU.Add(new KeyItemPair( "x64",StringParser.Parse("${res:Dialog.ProjectOptions.Build.TargetCPU.x64}")));
 			this.targetCPU.Add(new KeyItemPair( "Itanium",StringParser.Parse("${res:Dialog.ProjectOptions.Build.TargetCPU.Itanium}")));
-			
 			this.TargetCPU = targetCPU;
 			
 			
@@ -74,17 +69,8 @@ namespace CSharpBinding.OptionPanels
 			fileAlignment.Add(new KeyItemPair("2048", "2048"));
 			fileAlignment.Add(new KeyItemPair("4096", "4096"));
 			fileAlignment.Add(new KeyItemPair("8192", "8192"));
-			
 			FileAlign = fileAlignment;
 			
-			
-			this.UpdateProjectCommand  = new RelayCommand(UpdateProjectExecute);
-			this.ChangeOutputPath = new RelayCommand(ChangeOutputPathExecute);
-			UpdateTargetFrameworkCombo();
-			XmlDocHelper();
-			this.BaseIntermediateOutputPathCommand = new RelayCommand(BaseIntermediateOutputPathExecute);
-			this.IntermediateOutputPathCommand = new RelayCommand(IntermediateOutputPathExecute);
-			
 			this.warnLevel = new List<KeyItemPair>();
 			this.warnLevel.Add(new KeyItemPair("0","0"));
 			this.warnLevel.Add(new KeyItemPair("1","1"));
@@ -92,6 +78,16 @@ namespace CSharpBinding.OptionPanels
 			this.warnLevel.Add(new KeyItemPair("3","3"));
 			this.warnLevel.Add(new KeyItemPair("4","4"));
 			this.WarnLevel = warnLevel;   
+		}
+		
+		private void Initialize()
+		{
+			this.UpdateProjectCommand  = new RelayCommand(UpdateProjectExecute);
+			this.ChangeOutputPath = new RelayCommand(ChangeOutputPathExecute);
+			UpdateTargetFrameworkCombo();
+			XmlDocHelper();
+			this.BaseIntermediateOutputPathCommand = new RelayCommand(BaseIntermediateOutputPathExecute);
+			this.IntermediateOutputPathCommand = new RelayCommand(IntermediateOutputPathExecute);
 			SetTreatWarningAsErrorRadioButtons();
 			base.RaisePropertyChanged(string.Empty);
 		}
@@ -140,6 +136,16 @@ namespace CSharpBinding.OptionPanels
 			get {return GetProperty("RegisterForComInterop","",TextBoxEditMode.EditRawProperty ); }
 		}
 		
+		
+		public ProjectProperty<string> GenerateSerializationAssemblies {
+			get {return GetProperty("GenerateSerializationAssemblies","",TextBoxEditMode.EditRawProperty ); }
+		}
+		
+		
+		public ProjectProperty<string> PlatformTarget {
+			get {return GetProperty("PlatformTarget","",TextBoxEditMode.EditRawProperty ); }
+		}
+		
 		public ProjectProperty<string> FileAlignment {
 			get {return GetProperty("FileAlignment","",TextBoxEditMode.EditRawProperty ); }
 		}
@@ -282,7 +288,7 @@ namespace CSharpBinding.OptionPanels
 		}
 		
 		#endregion
-		
+	
 		
 		#region TargetCPU
 		
@@ -294,7 +300,6 @@ namespace CSharpBinding.OptionPanels
 		}
 		#endregion
 		
-		
 		#region FileAlignment
 		
 		public List<KeyItemPair> FileAlign {