diff --git a/QuizCards/MainWindow.xaml b/QuizCards/MainWindow.xaml
index 05a9c9c..635199a 100644
--- a/QuizCards/MainWindow.xaml
+++ b/QuizCards/MainWindow.xaml
@@ -58,7 +58,18 @@
                     <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Row="0" Text="{Binding Path=GameModel.CurrentItem.Question.Question, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="10" />
-                <ListBox Grid.Row="1" ItemsSource="{Binding Path=GameModel.CurrentItem.Question.Choices, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedAnswer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10" />
+                <ListBox Grid.Row="1" ItemsSource="{Binding Path=GameModel.CurrentItem.Question.Choices, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedAnswer, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10">
+                    <ListBox.Style>
+                        <Style TargetType="ListBox">
+                            <Setter Property="IsHitTestVisible" Value="True"/>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding GameModel.State}" Value="Feedback">
+                                    <Setter Property="IsHitTestVisible" Value="False" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </ListBox.Style>
+                </ListBox>
                 
                 <StackPanel Grid.Row="2" Margin="10" Orientation="Horizontal">
                     <StackPanel.Style>
@@ -117,7 +128,7 @@
                 </Button>
             </StackPanel>
 
-            <StackPanel Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
+            <StackPanel Grid.Column="1" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
                 <Button Command="{Binding AdvanceCommand}" Content="Next" Padding="10">
                     <Button.Style>
                         <Style TargetType="Button">
diff --git a/QuizCards/MainWindowViewModel.cs b/QuizCards/MainWindowViewModel.cs
index c45f3b4..698d3bf 100644
--- a/QuizCards/MainWindowViewModel.cs
+++ b/QuizCards/MainWindowViewModel.cs
@@ -60,11 +60,11 @@ public MainWindowViewModel()
         private void OpenNew(object obj)
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
-            // openFileDialog.InitialDirectory = "./Quizzes/";
             openFileDialog.ShowDialog();
             try
             {
                 GameModel = new GameModel(openFileDialog.FileName);
+                NotifyPropertyChanged("GameModel");
             }
             catch (Exception e)
             {