diff --git a/MafiaClient/MainWindow.axaml b/MafiaClient/MainWindow.axaml
index 55a5faf..285e879 100644
--- a/MafiaClient/MainWindow.axaml
+++ b/MafiaClient/MainWindow.axaml
@@ -109,7 +109,7 @@
             </Grid.RowDefinitions>
             
             <TextBlock Text="Ник:" FontSize="25" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Right"></TextBlock>
-            <TextBox Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" FontSize="25" x:Name="NickBox" TextInput="NickBox_OnTextInput"></TextBox>
+            <TextBox Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" FontSize="25" x:Name="NickBox"></TextBox>
             <Button Grid.Column="4" Grid.ColumnSpan="3" Grid.Row="11" Click="SettingsBack_OnClick" HorizontalAlignment="Stretch">
                 <Viewbox>
                     <TextBlock Text="Назад" FontSize="25"></TextBlock>
@@ -257,7 +257,9 @@
             </Grid.RowDefinitions>
             
             <TextBlock Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="7" HorizontalAlignment="Center" FontSize="30" x:Name="GameVotingActiveRole"></TextBlock>
-            <ListBox Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameVotingActiveChat"></ListBox>
+            <ScrollViewer Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameVotingActiveChatViewer">
+                <ItemsRepeater x:Name="GameVotingActiveChat"></ItemsRepeater>
+            </ScrollViewer>
             <TextBox Grid.Column="5" Grid.ColumnSpan="4" Grid.Row="10" TextWrapping="Wrap" x:Name="GameVotingActiveChatInput"></TextBox>
             <Button Grid.Column="9" Grid.Row="10" Click="GameVotingActiveChatSend_OnClick" HorizontalAlignment="Stretch">
                 <Viewbox>
@@ -323,7 +325,9 @@
                 <RowDefinition Height="10*"></RowDefinition>
             </Grid.RowDefinitions>
             <TextBlock FontSize="30" x:Name="GameDayHotBar" Text="Обсуждай и думай" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="7" HorizontalAlignment="Center" TextAlignment="Center"></TextBlock>
-            <ListBox Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameDayChat"></ListBox>
+            <ScrollViewer Grid.Column="5" Grid.ColumnSpan="5" Grid.Row="2" Grid.RowSpan="8" x:Name="GameDayViewer">
+                <ItemsRepeater x:Name="GameDayChat"></ItemsRepeater>
+            </ScrollViewer>
             <TextBox Grid.Column="5" Grid.ColumnSpan="4" Grid.Row="10" TextWrapping="Wrap" x:Name="GameDayChatInput"></TextBox>
             <Button Grid.Column="9" Grid.Row="10" Click="GameDayChatSend_OnClick" HorizontalAlignment="Stretch">
                 <Viewbox>
diff --git a/MafiaClient/MainWindow.axaml.cs b/MafiaClient/MainWindow.axaml.cs
index 1964f4c..e220479 100644
--- a/MafiaClient/MainWindow.axaml.cs
+++ b/MafiaClient/MainWindow.axaml.cs
@@ -102,6 +102,7 @@ namespace MafiaClient
         
         private void SettingsBack_OnClick(object sender, RoutedEventArgs e)
         {
+            Settings.Config().Nick = this.FindControl <TextBox> ("NickBox").Text;
             Settings.Save();
             HideAll();
             this.Find<Grid>("MainMenu").IsVisible = true;
@@ -118,11 +119,6 @@ namespace MafiaClient
             this.FindControl<TextBox>("NickBox").Text = Settings.Config().Nick;
         }
 
-        private void NickBox_OnTextInput(object sender, TextInputEventArgs e)
-        {
-            Settings.Config().Nick = this.FindControl<TextBox>("NickBox").Text;
-        }
-
         public void ShowGameQueueScreen()
         {
             HideAll();