diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
index 95fbe411dd..6616d55b7b 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
@@ -271,11 +271,14 @@
 								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}"
 								DisplayMemberPath="DisplayValue"
 								SelectedValuePath="Key"
 								SelectedIndex="3"></ComboBox>
@@ -359,13 +362,14 @@
 					<Label
 						Grid.Column="1"
 						Content="{core:Localize Dialog.ProjectOptions.Build.WarningLevel}"></Label>
-					<!-- Bad Ischl -->
+	
 					<ComboBox
 						x:Name="warningLevelComboBox"
 						Width="50"
 						Grid.Column="2"
 						HorizontalAlignment="Left"
 						ItemsSource="{Binding Path=DataContext.WarnLevel}"
+						SelectedValue="{Binding Path=DataContext.SelectedWarningLevel}"
 						DisplayMemberPath="DisplayValue"
 						SelectedValuePath="Key"
 						SelectedIndex="4"></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 fa3606960a..e62016ca74 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
@@ -5,6 +5,7 @@
  * Time: 19:54
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
@@ -92,7 +93,6 @@ namespace CSharpBinding.OptionPanels
 			this.warnLevel.Add(new KeyItemPair("4","4"));
 			this.WarnLevel = warnLevel;   
 			SetTreatWarningAsErrorRadioButtons();
-			LoadWarningsLevel();
 			base.RaisePropertyChanged(string.Empty);
 		}
 		
@@ -139,6 +139,12 @@ namespace CSharpBinding.OptionPanels
 		public ProjectProperty<string> RegisterForComInterop {
 			get {return GetProperty("RegisterForComInterop","",TextBoxEditMode.EditRawProperty ); }
 		}
+		
+		public ProjectProperty<string> FileAlignment {
+			get {return GetProperty("FileAlignment","",TextBoxEditMode.EditRawProperty ); }
+		}
+		
+		
 		// Fehlt noch
 		public ProjectProperty<string> BaseAddress {
 			get {return GetProperty("BaseAddress","0x400000",TextBoxEditMode.EditRawProperty ); }
@@ -298,6 +304,16 @@ namespace CSharpBinding.OptionPanels
 			}
 		}
 		
+		
+		public string SelectedFileAlign
+		{
+			get {return this.FileAlignment.Value;}
+			set {this.FileAlignment.Value = value;
+				base.RaisePropertyChanged(()=> SelectedFileAlign);
+			}
+		}
+		
+		
 		#endregion
 		
 		#region BaseIntermediateOutputPath
@@ -344,23 +360,16 @@ namespace CSharpBinding.OptionPanels
 			}
 		}
 		
-		private void LoadWarningsLevel ()
-		{
-			string val = WarningLevel.Value;
-			System.Console.WriteLine(val);
-			var i = WarnLevel.FindIndex(
-				delegate(KeyItemPair pair)
-				{
-					return pair.Key == val;
-				}
-			);
-		}
-			
-			
-		private void SaveWarningsLevel()
-		{
 			
+		public string SelectedWarningLevel {
+			get {
+				return this.WarningLevel.Value; }
+			set {
+				WarningLevel.Value = value;
+				base.RaisePropertyChanged(() => SelectedWarningLevel);
+			}
 		}
+
 		#endregion
 		
 		#region SpecificWarnings TreatWarningsAsErrors