diff --git a/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs b/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs
index 842d1f58..45f346e4 100644
--- a/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs
+++ b/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs
@@ -3,7 +3,6 @@
     public interface IBuildProgressViewModel
     {
         bool ActionProgressIsPaused { get; set; }
-        bool ActionProgressIsVisible { get; set; }
         int CurrentQueuePosOfBuildingProject { get; }
 
         void OnBuildBegin(int projectsCount);
diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj
index 5d725b9e..8a335f40 100644
--- a/src/BuildVision.UI/BuildVision.UI.csproj
+++ b/src/BuildVision.UI/BuildVision.UI.csproj
@@ -73,6 +73,9 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Components\ProjectGrid.xaml.cs">
+      <DependentUpon>ProjectGrid.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\BuildVisionProgressBar.xaml.cs">
       <DependentUpon>BuildVisionProgressBar.xaml</DependentUpon>
     </Compile>
@@ -228,6 +231,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Components\ProjectGrid.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Components\SpinnerControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
index 925ea778..3cb87af2 100644
--- a/src/BuildVision.UI/Components/ControlView.xaml
+++ b/src/BuildVision.UI/Components/ControlView.xaml
@@ -12,6 +12,7 @@
              xmlns:customButtons="clr-namespace:BuildVision.UI.Controls.Buttons"
              xmlns:indicators="clr-namespace:BuildVision.UI.Controls.Indicators"
              xmlns:controls="clr-namespace:BuildVision.UI.Controls"
+             xmlns:components="clr-namespace:BuildVision.UI.Components"
              mc:Ignorable="d"
              Name="OwnerUserControl"
              Background="{DynamicResource ToolWindowBackgroundKey}"
@@ -31,70 +32,13 @@
                 <ResourceDictionary Source="../Styles/DataGridColumnHeaderStyle.xaml" />
                 <ResourceDictionary Source="../Styles/ControlViewStyle.xaml" />
                 <ResourceDictionary Source="../Resources/ValueIndicator.Resources.xaml" />
+                <ResourceDictionary Source="../Resources/BuildResult.Resources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
 
             <viewModels:BuildVisionPaneViewModel x:Key="DesignViewModel"/>
             <helpers:BindingProxy x:Key="proxy" Data="{Binding}" />
 
-            <CollectionViewSource x:Key="GridColumnsCollection" Source="{Binding ElementName=Grid, Path=Columns}" />
-
-            <CompositeCollection x:Key="GridColumnsMenuItems">
-                <CollectionContainer Collection="{Binding Source={StaticResource GridColumnsCollection}}" />
-                <Separator />
-                <MenuItem Command="{Binding OpenGridColumnsSettingsAction}"
-                          CommandParameter="{Binding Source={StaticResource GridColumnsCollection}}"
-                          Header="{x:Static res:Resources.GridColumnsOpenSettingsMenuItem}"
-                          IsCheckable="False"
-                          IsChecked="False"
-                          StaysOpenOnClick="False" />
-            </CompositeCollection>
-
-            <CompositeCollection x:Key="CopyBuildOutputFilesToClipboardMenuItems">
-                <MenuItem Command="{Binding SelectedProjectCopyBuildOutputFilesToClipboardAction}"
-                          Header="{x:Static res:Resources.SelectedProjectItem_CopyBuildOutputFilesToClipboard_CopyMenuItem}"/>
-                <Separator />
-                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_BuiltAssemblies}"
-                          IsCheckable="True"
-                          StaysOpenOnClick="True"
-                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.Built}" />
-                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_Symbols}"
-                          IsCheckable="True"
-                          StaysOpenOnClick="True"
-                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.Symbols}" />
-                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_Documentation}"
-                          IsCheckable="True"
-                          StaysOpenOnClick="True"
-                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.Documentation}" />
-                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_LocalizedRes}"
-                          IsCheckable="True"
-                          StaysOpenOnClick="True"
-                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.LocalizedResourceDlls}" />
-                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_ContentFiles}"
-                          IsCheckable="True"
-                          StaysOpenOnClick="True"
-                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.ContentFiles}" />
-                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_XmlSerAssemblies}"
-                          IsCheckable="True"
-                          StaysOpenOnClick="True"
-                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.XmlSerializer}" />
-                <Separator />
-                <MenuItem Command="{Binding SelectedProjectCopyBuildOutputFilesToClipboardAction}"
-                          Header="{x:Static res:Resources.SelectedProjectItem_CopyBuildOutputFilesToClipboard_CopyMenuItem}"/>
-            </CompositeCollection>
-
-            <CompositeCollection x:Key="SelectedProjectMenuItems">
-                <MenuItem Command="{Binding SelectedProjectBuildAction}" Header="{x:Static res:Resources.BuildActionBuild}" />
-                <MenuItem Command="{Binding SelectedProjectRebuildAction}" Header="{x:Static res:Resources.BuildActionRebuildAll}" />
-                <MenuItem Command="{Binding SelectedProjectCleanAction}" Header="{x:Static res:Resources.BuildActionClean}" />
-                <Separator />
-                <MenuItem Command="{Binding SelectedProjectOpenContainingFolderAction}" Header="{x:Static res:Resources.SelectedProjectItem_OpenContainingFolder_MenuItem}" />
-                <MenuItem Header="{x:Static res:Resources.SelectedProjectItem_CopyBuildOutputFilesToClipboard_ParentMenuItem}" 
-                          ItemsSource="{Binding Source={StaticResource CopyBuildOutputFilesToClipboardMenuItems}}"/>
-                <Separator />
-                <MenuItem Header="Copy Errors"  Command="{Binding SelectedProjectCopyErrorMessagesAction}"/>
-            </CompositeCollection>
-
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -114,17 +58,17 @@
 
                 <ContentControl Grid.Column="0"
                         Margin="0,-7,8,0"
-                        Template="{DynamicResource State}" />
+                        Template="{StaticResource StandBy}" />
 
                 <TextBlock Grid.Column="1"
                        FontSize="18"
                        Foreground="{DynamicResource ToolWindowTextKey}"
-                       Text="{Binding StateMessage}"
+                       Text="{Binding BuildInformationModel.StateMessage}"
                        TextTrimming="WordEllipsis"
                        extensions:TextBlockUtils.AutoTooltip="True" />
             </Grid>
-            
-            <controls:BuildVisionProgressBar DataContext="{Binding BuildProgressViewModel.ActionProgressIsVisible}" />
+
+            <controls:BuildVisionProgressBar DataContext="{Binding BuildInformationModel.CurrentBuildState}" />
 
             <Grid Visibility="{Binding ControlSettings.GeneralSettings.IndicatorsPanelVisible,
                                        Converter={StaticResource BoolToVisibilityConverter}}">
@@ -260,240 +204,7 @@
 
             </Grid>
         </StackPanel>
-        
-        <DataGrid Name="Grid"
-                  Grid.Row="1"
-                  AlternatingRowBackground="{Binding ElementName=Grid,
-                                                     Path=RowBackground,
-                                                     Converter={StaticResource AlternatingRowBackgroundConverter}}"
-                  AlternationCount="2"
-                  AreRowDetailsFrozen="True"
-                  AutoGenerateColumns="False"
-                  Background="{DynamicResource ToolboxBackgroundKey}"
-                  BorderBrush="{DynamicResource PanelBorderKey}"
-                  CanUserAddRows="False"
-                  CanUserDeleteRows="False"
-                  CanUserReorderColumns="True"
-                  CanUserResizeRows="False"
-                  CanUserSortColumns="True"
-                  EnableColumnVirtualization="False"
-                  EnableRowVirtualization="False"
-                  GridLinesVisibility="None"
-                  HeadersVisibility="{Binding GridHeadersVisibility}"
-                  IsReadOnly="True"
-                  ItemsSource="{Binding GroupedProjectsList, 
-                                        NotifyOnTargetUpdated=True}"
-                  RowBackground="{DynamicResource ToolboxBackgroundKey}"
-                  ScrollViewer.CanContentScroll="{Binding GridGroupPropertyName, 
-                                                          Converter={StaticResource StringIsNullOrEmptyConverter}}"
-                  ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                  ScrollViewer.IsDeferredScrollingEnabled="False"
-                  ScrollViewer.VerticalScrollBarVisibility="Auto"
-                  SelectedItem="{Binding SelectedProjectItem}"
-                  SelectionMode="Single"
-                  SelectionUnit="FullRow"
-                  Sorting="GridOnSorting"
-                  VirtualizingStackPanel.IsVirtualizing="False"
-                  ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}">
-
-            <DataGrid.CellStyle>
-                <Style TargetType="DataGridCell">
-                    <Style.Triggers>
-
-                        <Trigger Property="IsSelected"
-                                 Value="True">
-                            <Setter Property="Background"
-                                    Value="Transparent" />
-                            <Setter Property="Foreground"
-                                    Value="{DynamicResource ToolWindowTextKey}" />
-                        </Trigger>
-
-                        <!--
-                            <DataTrigger Binding="{Binding ErrorsCount, Converter={StaticResource NumberIsPositive}}" Value="True">
-                            <Setter Property="Background" Value="PaleVioletRed" />
-                            <Setter Property="Foreground" Value="Black" />
-                            </DataTrigger>
-                        -->
-
-                    </Style.Triggers>
-
-
-                    <Setter Property="FocusVisualStyle"
-                            Value="{x:Null}" />
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="DataGridCell">
-                                <Border Background="{TemplateBinding Panel.Background}"
-                                        BorderBrush="{TemplateBinding Border.BorderBrush}"
-                                        BorderThickness="0"
-                                        SnapsToDevicePixels="True">
-                                    <!--  BorderThickness="{TemplateBinding Border.BorderThickness}"  -->
-                                    <ContentPresenter Margin="1,0,0,0"
-                                                      VerticalAlignment="Center"
-                                                      Content="{TemplateBinding ContentControl.Content}"
-                                                      ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
-                                                      ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
-                                                      SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
-                                </Border>
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </DataGrid.CellStyle>
-
-            <DataGrid.RowStyle>
-                <Style TargetType="DataGridRow">
-
-                    <Setter Property="Foreground"
-                            Value="{DynamicResource ToolWindowTextKey}" />
-                    <Setter Property="BorderThickness"
-                            Value="0,1,0,1" />
-                    <Setter Property="BorderBrush"
-                            Value="{Binding Background, RelativeSource={RelativeSource self}}" />
-
-                    <Setter Property="DetailsVisibility"
-                            Value="{Binding ErrorsCount, Mode=OneWay, Converter={StaticResource PositiveNumberToVisibilityConverter}}" />
-                    <EventSetter Event="PreviewMouseLeftButtonDown"
-                                 Handler="DataGridRowOnPreviewMouseLeftButtonDown" />
-
-                    <Style.Triggers>
-
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Value="{x:Static contracts:ProjectState.UpToDate}" Binding="{Binding Path=State}"/>
-                                <Condition Binding="{Binding Path=DataContext.HideUpToDateTargets, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Visibility" Value="Collapsed"/>
-                        </MultiDataTrigger>
-
-                        <DataTrigger Value="True">
-                            <DataTrigger.Binding>
-                                <MultiBinding Converter="{StaticResource ObjectsReferencesEqualsConverter}">
-                                    <Binding Path="DataContext.CurrentProject"
-                                             RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
-                                    <Binding Path="." />
-                                </MultiBinding>
-                            </DataTrigger.Binding>
-                            <Setter Property="BorderBrush"
-                                    Value="CornflowerBlue" />
-                            <Setter Property="BorderThickness"
-                                    Value="0,1,0,1" />
-                        </DataTrigger>
-
-                        <!-- TODO: Make Selected row style similar to style in VisualStudio.-->
-                        <Trigger Property="IsSelected"
-                                 Value="True">
-                            <Setter Property="BorderBrush"
-                                    Value="DodgerBlue" />
-                            <Setter Property="BorderThickness"
-                                    Value="0,1,0,1" />
-                        </Trigger>
-
-                    </Style.Triggers>
-                </Style>
-            </DataGrid.RowStyle>
-
-            <DataGrid.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Header="{x:Static res:Resources.SelectedProjectItemMenuItems}"
-                              ItemsSource="{Binding Source={StaticResource SelectedProjectMenuItems}}"
-                              Visibility="{Binding SelectedProjectItem,
-                                                   Converter={StaticResource NotNullToVisibilityConverter}}" />
-                    <Separator Visibility="{Binding SelectedProjectItem,
-                                                   Converter={StaticResource NotNullToVisibilityConverter}}" />
-                    <MenuItem Header="{x:Static res:Resources.GridHeaderVisibleMenuItem}"
-                              IsCheckable="True"
-                              IsChecked="{Binding GridHeadersVisibility,
-                                                  Converter={StaticResource ResourceKey=ColumnHeadersVisibilityToBool}}" />
-                    <MenuItem Header="{x:Static res:Resources.HideUpToDateTargetsMenuItem}"
-                              IsCheckable="True"
-                              IsChecked="{Binding HideUpToDateTargets}" />
-                    <MenuItem Header="{x:Static res:Resources.GridColumnsMenuItems}"
-                              ItemsSource="{Binding Source={StaticResource GridColumnsMenuItems}}">
-                        <MenuItem.ItemContainerStyle>
-                            <Style TargetType="{x:Type MenuItem}">
-                                <Setter Property="StaysOpenOnClick"
-                                        Value="True" />
-                                <Setter Property="IsCheckable"
-                                        Value="True" />
-                                <Setter Property="IsChecked"
-                                        Value="{Binding Visibility, Converter={StaticResource ResourceKey=VisibilityToBoolConverter}}" />
-                                <Setter Property="Header"
-                                        Value="{Binding (extensions:DataGridColumnExtensions.Name)}" />
-                            </Style>
-                        </MenuItem.ItemContainerStyle>
-                    </MenuItem>
-                    <MenuItem Header="{x:Static res:Resources.GridColumnsGroupMenuItems}"
-                              ItemsSource="{Binding GridColumnsGroupMenuItems}" />
-                    <MenuItem Command="{Binding OpenGeneralSettingsAction}"
-                              Header="{x:Static res:Resources.OpenGeneralSettingsMenuItem}" />
-                    <Separator/>
-                    <MenuItem Command="{Binding ReportIssues}"
-                              Header="{x:Static res:Resources.ReportIssues}" />
-                </ContextMenu>
-            </DataGrid.ContextMenu>
-
-            <DataGrid.GroupStyle>
-                <GroupStyle>
-                    <GroupStyle.ContainerStyle>
-                        <Style TargetType="{x:Type GroupItem}">
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type GroupItem}">
-                                        <Expander Collapsed="DataGridExpanderOnCollapsed"
-                                                  Expanded="DataGridExpanderOnExpanded"
-                                                  Mouse.PreviewMouseWheel="DataGridExpanderOnPreviewMouseWheel"
-                                                  OverridesDefaultStyle="True"
-                                                  Template="{StaticResource ExpanderTemplate}">
-                                            <Expander.IsExpanded>
-                                                <MultiBinding Converter="{StaticResource ResourceKey=ExpanderIsExpandedConverter}"
-                                                              Mode="OneWay">
-                                                    <Binding Mode="OneWay" />
-                                                    <Binding Path="DataContext.ControlSettings.GridSettings.CollapsedGroups"
-                                                             Source="{x:Reference OwnerUserControl}" />
-                                                </MultiBinding>
-                                            </Expander.IsExpanded>
-                                            <Expander.Header>
-                                                <StackPanel VerticalAlignment="Center"
-                                                            Orientation="Horizontal">
-                                                    <TextBlock Foreground="{DynamicResource GrayTextKey}">
-                                                        <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ResourceKey=MultiBindingStringFormatConverter}"
-                                                                          Mode="OneWay">
-                                                                <Binding Path="DataContext.ControlSettings.GridSettings.GroupHeaderRawFormat"
-                                                                         Source="{x:Reference OwnerUserControl}" />
-                                                                <Binding Path="DataContext.GridGroupHeaderName"
-                                                                         Source="{x:Reference OwnerUserControl}" />
-                                                                <Binding Path="Name" />
-                                                                <Binding Path="ItemCount" />
-                                                            </MultiBinding>
-                                                        </TextBlock.Text>
-                                                    </TextBlock>
-                                                </StackPanel>
-                                            </Expander.Header>
-                                            <ItemsPresenter />
-                                        </Expander>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </GroupStyle.ContainerStyle>
-                </GroupStyle>
-            </DataGrid.GroupStyle>
 
-            <DataGrid.RowDetailsTemplate>
-                <DataTemplate>
-                    <views:ErrorsGrid Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type ScrollContentPresenter}},
-                                                                  Path=ActualWidth,
-                                                                  Converter={StaticResource SubtractConstantConverter},
-                                                                  ConverterParameter=6}"
-                                                  HorizontalAlignment="Left"
-                                                  Background="Transparent"
-                                                  MouseLeftButtonDown="DataGridRowDetailsOnMouseLeftButtonDown"
-                                                  ProjectItem="{Binding}"
-                                                  MaxHeight="100" />
-                </DataTemplate>
-            </DataGrid.RowDetailsTemplate>
-        </DataGrid>
+        <components:ProjectGrid DataContext="{Binding}" Grid.Row="1"/>
     </Grid>
 </UserControl>
diff --git a/src/BuildVision.UI/Components/ControlView.xaml.cs b/src/BuildVision.UI/Components/ControlView.xaml.cs
index 1d4101ec..0e5a3029 100644
--- a/src/BuildVision.UI/Components/ControlView.xaml.cs
+++ b/src/BuildVision.UI/Components/ControlView.xaml.cs
@@ -37,31 +37,11 @@ public ControlView()
             //Grid.TargetUpdated += GridOnTargetUpdated;
         }
 
-        private void GridOnTargetUpdated(object sender, DataTransferEventArgs e)
-        {
-            if (e.Property.Name == "ItemsSource")
-                RefreshSortDirectionInGrid();
-        }
-
-        private void RefreshSortDirectionInGrid()
-        {
-            //DataGridColumn dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == _viewModel.GridSortDescription.Property);
-            //if (dataGridColumn != null)
-            //    dataGridColumn.SortDirection = _viewModel.GridSortDescription.Order.ToSystem();
-        }
-
-        private void GridOnSorting(object sender, DataGridSortingEventArgs e)
-        {
-            if (_viewModel.GridSorting.CanExecute(e))
-                _viewModel.GridSorting.Execute(e);
-        }
-
         private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             Debug.Assert(DataContext != null);
 
-            _viewModel = (BuildVisionPaneViewModel)DataContext;
-            //_viewModel.SetGridColumnsRef(Grid.Columns);
+            _viewModel = (BuildVisionPaneViewModel) DataContext;
             _viewModel.PropertyChanged += ViewModelOnPropertyChanged;
         }
 
@@ -78,64 +58,5 @@ private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs
             //}
         }
 
-        private void DataGridExpanderOnExpanded(object sender, RoutedEventArgs e)
-        {
-            ExpanderIsExpandedConverter.SaveState(
-                (Expander)sender,
-                false,
-                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
-            e.Handled = true;
-        }
-
-        private void DataGridExpanderOnCollapsed(object sender, RoutedEventArgs e)
-        {
-            ExpanderIsExpandedConverter.SaveState(
-                (Expander)sender,
-                true,
-                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
-            e.Handled = true;
-        }
-
-        // Send scrolling to the DataGrid.
-        private void DataGridExpanderOnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            e.Handled = true;
-            var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta)
-                               {
-                                    RoutedEvent = MouseWheelEvent, 
-                                    Source = sender
-                               };
-
-            var parent = (UIElement)VisualTreeHelper.GetParent((DependencyObject)sender);
-            parent.RaiseEvent(eventArg);
-        }
-
-        private void DataGridRowDetailsOnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            // http://stackoverflow.com/questions/6279724/mousedoubleclick-events-dont-bubble/6326181#6326181)
-            if (e.ClickCount == 2)
-                e.Handled = true;
-        }
-
-        // Autofocus for RowDetails (without extra mouse click).
-        private void DataGridRowOnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            var row = (DataGridRow)sender;
-            if (!row.IsSelected && e.Source is DataGridDetailsPresenter)
-            {
-                row.Focusable = true;
-                row.Focus();
-
-                // Gets the element with keyboard focus.
-                var elementWithFocus = Keyboard.FocusedElement as UIElement;
-
-                // Change keyboard focus.
-                if (elementWithFocus != null)
-                {
-                    var request = new TraversalRequest(FocusNavigationDirection.Next);
-                    elementWithFocus.MoveFocus(request);
-                }
-            }
-        }
     }
 }
diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml b/src/BuildVision.UI/Components/ProjectGrid.xaml
new file mode 100644
index 00000000..950e7741
--- /dev/null
+++ b/src/BuildVision.UI/Components/ProjectGrid.xaml
@@ -0,0 +1,333 @@
+<UserControl x:Class="BuildVision.UI.Components.ProjectGrid"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:res="clr-namespace:BuildVision.UI"
+             xmlns:views="clr-namespace:BuildVision.UI"
+             xmlns:viewModels="clr-namespace:BuildVision.UI.ViewModels"
+             xmlns:extensions="clr-namespace:BuildVision.UI.Extensions"
+             xmlns:helpers="clr-namespace:BuildVision.UI.Helpers"
+             xmlns:contracts="clr-namespace:BuildVision.Contracts;assembly=BuildVision.Contracts"
+             xmlns:customButtons="clr-namespace:BuildVision.UI.Controls.Buttons"
+             xmlns:indicators="clr-namespace:BuildVision.UI.Controls.Indicators"
+             xmlns:controls="clr-namespace:BuildVision.UI.Controls"
+             xmlns:local="clr-namespace:BuildVision.UI.Components"
+             mc:Ignorable="d" 
+             Background="{DynamicResource ToolWindowBackgroundKey}"
+             DataContextChanged="OnDataContextChanged"
+             SnapsToDevicePixels="True"
+             UseLayoutRounding="True"
+             d:DesignHeight="148"
+             d:DesignWidth="697"
+             d:DataContext="{Binding Source={StaticResource DesignViewModel}}">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../Resources/CommonResources.xaml" />
+                <ResourceDictionary Source="../Resources/BuildAction.Resources.xaml" />
+                <ResourceDictionary Source="../Styles/ScrollViewerStyle.xaml" />
+                <ResourceDictionary Source="../Styles/DataGridColumnHeaderStyle.xaml" />
+                <ResourceDictionary Source="../Styles/ControlViewStyle.xaml" />
+                <ResourceDictionary Source="../Resources/ValueIndicator.Resources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <CollectionViewSource x:Key="GridColumnsCollection" Source="{Binding ElementName=Grid, Path=Columns}" />
+
+            <viewModels:BuildVisionPaneViewModel x:Key="DesignViewModel"/>
+            <helpers:BindingProxy x:Key="proxy" Data="{Binding}" />
+
+            <CompositeCollection x:Key="CopyBuildOutputFilesToClipboardMenuItems">
+                <MenuItem Command="{Binding SelectedProjectCopyBuildOutputFilesToClipboardAction}"
+                          Header="{x:Static res:Resources.SelectedProjectItem_CopyBuildOutputFilesToClipboard_CopyMenuItem}"/>
+                <Separator />
+                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_BuiltAssemblies}"
+                          IsCheckable="True"
+                          StaysOpenOnClick="True"
+                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.Built}" />
+                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_Symbols}"
+                          IsCheckable="True"
+                          StaysOpenOnClick="True"
+                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.Symbols}" />
+                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_Documentation}"
+                          IsCheckable="True"
+                          StaysOpenOnClick="True"
+                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.Documentation}" />
+                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_LocalizedRes}"
+                          IsCheckable="True"
+                          StaysOpenOnClick="True"
+                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.LocalizedResourceDlls}" />
+                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_ContentFiles}"
+                          IsCheckable="True"
+                          StaysOpenOnClick="True"
+                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.ContentFiles}" />
+                <MenuItem Header="{x:Static res:Resources.ProjectItemSettings_CopyBuildOutputFilesToClipboard_Type_XmlSerAssemblies}"
+                          IsCheckable="True"
+                          StaysOpenOnClick="True"
+                          IsChecked="{Binding ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.XmlSerializer}" />
+                <Separator />
+                <MenuItem Command="{Binding SelectedProjectCopyBuildOutputFilesToClipboardAction}"
+                          Header="{x:Static res:Resources.SelectedProjectItem_CopyBuildOutputFilesToClipboard_CopyMenuItem}"/>
+            </CompositeCollection>
+
+            <CompositeCollection x:Key="SelectedProjectMenuItems">
+                <MenuItem Command="{Binding SelectedProjectBuildAction}" Header="{x:Static res:Resources.BuildActionBuild}" />
+                <MenuItem Command="{Binding SelectedProjectRebuildAction}" Header="{x:Static res:Resources.BuildActionRebuildAll}" />
+                <MenuItem Command="{Binding SelectedProjectCleanAction}" Header="{x:Static res:Resources.BuildActionClean}" />
+                <Separator />
+                <MenuItem Command="{Binding SelectedProjectOpenContainingFolderAction}" Header="{x:Static res:Resources.SelectedProjectItem_OpenContainingFolder_MenuItem}" />
+                <MenuItem Header="{x:Static res:Resources.SelectedProjectItem_CopyBuildOutputFilesToClipboard_ParentMenuItem}" 
+                          ItemsSource="{Binding Source={StaticResource CopyBuildOutputFilesToClipboardMenuItems}}"/>
+                <Separator />
+                <MenuItem Header="Copy Errors"  Command="{Binding SelectedProjectCopyErrorMessagesAction}"/>
+            </CompositeCollection>
+
+            <CompositeCollection x:Key="GridColumnsMenuItems">
+                <CollectionContainer Collection="{Binding Source={StaticResource GridColumnsCollection}}" />
+                <Separator />
+                <MenuItem Command="{Binding OpenGridColumnsSettingsAction}"
+                          CommandParameter="{Binding Source={StaticResource GridColumnsCollection}}"
+                          Header="{x:Static res:Resources.GridColumnsOpenSettingsMenuItem}"
+                          IsCheckable="False"
+                          IsChecked="False"
+                          StaysOpenOnClick="False" />
+            </CompositeCollection>
+
+
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <DataGrid Name="Grid"
+                  Grid.Row="1"
+                  AlternatingRowBackground="{Binding ElementName=Grid,
+                                                     Path=RowBackground,
+                                                     Converter={StaticResource AlternatingRowBackgroundConverter}}"
+                  AlternationCount="2"
+                  AreRowDetailsFrozen="True"
+                  AutoGenerateColumns="False"
+                  Background="{DynamicResource ToolboxBackgroundKey}"
+                  BorderBrush="{DynamicResource PanelBorderKey}"
+                  CanUserAddRows="False"
+                  CanUserDeleteRows="False"
+                  CanUserReorderColumns="True"
+                  CanUserResizeRows="False"
+                  CanUserSortColumns="True"
+                  EnableColumnVirtualization="False"
+                  EnableRowVirtualization="False"
+                  GridLinesVisibility="None"
+                  HeadersVisibility="{Binding GridHeadersVisibility}"
+                  IsReadOnly="True"
+                  ItemsSource="{Binding GroupedProjectsList, 
+                                        NotifyOnTargetUpdated=True}"
+                  RowBackground="{DynamicResource ToolboxBackgroundKey}"
+                  ScrollViewer.CanContentScroll="{Binding GridGroupPropertyName, 
+                                                          Converter={StaticResource StringIsNullOrEmptyConverter}}"
+                  ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                  ScrollViewer.IsDeferredScrollingEnabled="False"
+                  ScrollViewer.VerticalScrollBarVisibility="Auto"
+                  SelectedItem="{Binding SelectedProjectItem}"
+                  SelectionMode="Single"
+                  SelectionUnit="FullRow"
+                  Sorting="GridOnSorting"
+                  VirtualizingStackPanel.IsVirtualizing="False"
+                  ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}">
+
+        <DataGrid.CellStyle>
+            <Style TargetType="DataGridCell">
+                <Style.Triggers>
+
+                    <Trigger Property="IsSelected"
+                                 Value="True">
+                        <Setter Property="Background"
+                                    Value="Transparent" />
+                        <Setter Property="Foreground"
+                                    Value="{DynamicResource ToolWindowTextKey}" />
+                    </Trigger>
+
+                    <!--
+                            <DataTrigger Binding="{Binding ErrorsCount, Converter={StaticResource NumberIsPositive}}" Value="True">
+                            <Setter Property="Background" Value="PaleVioletRed" />
+                            <Setter Property="Foreground" Value="Black" />
+                            </DataTrigger>
+                        -->
+
+                </Style.Triggers>
+
+
+                <Setter Property="FocusVisualStyle"
+                            Value="{x:Null}" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="DataGridCell">
+                            <Border Background="{TemplateBinding Panel.Background}"
+                                        BorderBrush="{TemplateBinding Border.BorderBrush}"
+                                        BorderThickness="0"
+                                        SnapsToDevicePixels="True">
+                                <!--  BorderThickness="{TemplateBinding Border.BorderThickness}"  -->
+                                <ContentPresenter Margin="1,0,0,0"
+                                                      VerticalAlignment="Center"
+                                                      Content="{TemplateBinding ContentControl.Content}"
+                                                      ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}"
+                                                      ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                                      SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </DataGrid.CellStyle>
+
+        <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+
+                <Setter Property="Foreground"
+                            Value="{DynamicResource ToolWindowTextKey}" />
+                <Setter Property="BorderThickness"
+                            Value="0,1,0,1" />
+                <Setter Property="BorderBrush"
+                            Value="{Binding Background, RelativeSource={RelativeSource self}}" />
+
+                <Setter Property="DetailsVisibility"
+                            Value="{Binding ErrorsCount, Mode=OneWay, Converter={StaticResource PositiveNumberToVisibilityConverter}}" />
+                <EventSetter Event="PreviewMouseLeftButtonDown"
+                                 Handler="DataGridRowOnPreviewMouseLeftButtonDown" />
+
+                <Style.Triggers>
+
+                    <MultiDataTrigger>
+                        <MultiDataTrigger.Conditions>
+                            <Condition Value="{x:Static contracts:ProjectState.UpToDate}" Binding="{Binding Path=State}"/>
+                            <Condition Binding="{Binding Path=DataContext.HideUpToDateTargets, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="True"/>
+                        </MultiDataTrigger.Conditions>
+                        <Setter Property="Visibility" Value="Collapsed"/>
+                    </MultiDataTrigger>
+
+                    <DataTrigger Value="True">
+                        <DataTrigger.Binding>
+                            <MultiBinding Converter="{StaticResource ObjectsReferencesEqualsConverter}">
+                                <Binding Path="DataContext.CurrentProject"
+                                             RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                                <Binding Path="." />
+                            </MultiBinding>
+                        </DataTrigger.Binding>
+                        <Setter Property="BorderBrush"
+                                    Value="CornflowerBlue" />
+                        <Setter Property="BorderThickness"
+                                    Value="0,1,0,1" />
+                    </DataTrigger>
+
+                    <!-- TODO: Make Selected row style similar to style in VisualStudio.-->
+                    <Trigger Property="IsSelected"
+                                 Value="True">
+                        <Setter Property="BorderBrush"
+                                    Value="DodgerBlue" />
+                        <Setter Property="BorderThickness"
+                                    Value="0,1,0,1" />
+                    </Trigger>
+
+                </Style.Triggers>
+            </Style>
+        </DataGrid.RowStyle>
+
+        <DataGrid.ContextMenu>
+            <ContextMenu>
+                <MenuItem Header="{x:Static res:Resources.SelectedProjectItemMenuItems}"
+                              ItemsSource="{Binding Source={StaticResource SelectedProjectMenuItems}}"
+                              Visibility="{Binding SelectedProjectItem,
+                                                   Converter={StaticResource NotNullToVisibilityConverter}}" />
+                <Separator Visibility="{Binding SelectedProjectItem,
+                                                   Converter={StaticResource NotNullToVisibilityConverter}}" />
+                <MenuItem Header="{x:Static res:Resources.GridHeaderVisibleMenuItem}"
+                              IsCheckable="True"
+                              IsChecked="{Binding GridHeadersVisibility,
+                                                  Converter={StaticResource ResourceKey=ColumnHeadersVisibilityToBool}}" />
+                <MenuItem Header="{x:Static res:Resources.HideUpToDateTargetsMenuItem}"
+                              IsCheckable="True"
+                              IsChecked="{Binding HideUpToDateTargets}" />
+                <MenuItem Header="{x:Static res:Resources.GridColumnsMenuItems}"
+                              ItemsSource="{Binding Source={StaticResource GridColumnsMenuItems}}">
+                    <MenuItem.ItemContainerStyle>
+                        <Style TargetType="{x:Type MenuItem}">
+                            <Setter Property="StaysOpenOnClick"
+                                        Value="True" />
+                            <Setter Property="IsCheckable"
+                                        Value="True" />
+                            <Setter Property="IsChecked"
+                                        Value="{Binding Visibility, Converter={StaticResource ResourceKey=VisibilityToBoolConverter}}" />
+                            <Setter Property="Header"
+                                        Value="{Binding (extensions:DataGridColumnExtensions.Name)}" />
+                        </Style>
+                    </MenuItem.ItemContainerStyle>
+                </MenuItem>
+                <MenuItem Header="{x:Static res:Resources.GridColumnsGroupMenuItems}"
+                              ItemsSource="{Binding GridColumnsGroupMenuItems}" />
+                <MenuItem Command="{Binding OpenGeneralSettingsAction}"
+                              Header="{x:Static res:Resources.OpenGeneralSettingsMenuItem}" />
+                <Separator/>
+                <MenuItem Command="{Binding ReportIssues}"
+                              Header="{x:Static res:Resources.ReportIssues}" />
+            </ContextMenu>
+        </DataGrid.ContextMenu>
+
+        <DataGrid.GroupStyle>
+            <GroupStyle>
+                <GroupStyle.ContainerStyle>
+                    <Style TargetType="{x:Type GroupItem}">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type GroupItem}">
+                                    <Expander Collapsed="DataGridExpanderOnCollapsed"
+                                                  Expanded="DataGridExpanderOnExpanded"
+                                                  Mouse.PreviewMouseWheel="DataGridExpanderOnPreviewMouseWheel"
+                                                  OverridesDefaultStyle="True"
+                                                  Template="{StaticResource ExpanderTemplate}">
+                                        <Expander.IsExpanded>
+                                            <MultiBinding Converter="{StaticResource ResourceKey=ExpanderIsExpandedConverter}"
+                                                              Mode="OneWay">
+                                                <Binding Mode="OneWay" />
+                                                <Binding Path="DataContext.ControlSettings.GridSettings.CollapsedGroups"
+                                                             Source="{x:Reference OwnerUserControl}" />
+                                            </MultiBinding>
+                                        </Expander.IsExpanded>
+                                        <Expander.Header>
+                                            <StackPanel VerticalAlignment="Center"
+                                                            Orientation="Horizontal">
+                                                <TextBlock Foreground="{DynamicResource GrayTextKey}">
+                                                    <TextBlock.Text>
+                                                        <MultiBinding Converter="{StaticResource ResourceKey=MultiBindingStringFormatConverter}"
+                                                                          Mode="OneWay">
+                                                            <Binding Path="DataContext.ControlSettings.GridSettings.GroupHeaderRawFormat"
+                                                                         Source="{x:Reference OwnerUserControl}" />
+                                                            <Binding Path="DataContext.GridGroupHeaderName"
+                                                                         Source="{x:Reference OwnerUserControl}" />
+                                                            <Binding Path="Name" />
+                                                            <Binding Path="ItemCount" />
+                                                        </MultiBinding>
+                                                    </TextBlock.Text>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </Expander.Header>
+                                        <ItemsPresenter />
+                                    </Expander>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </GroupStyle.ContainerStyle>
+            </GroupStyle>
+        </DataGrid.GroupStyle>
+
+        <DataGrid.RowDetailsTemplate>
+            <DataTemplate>
+                <views:ErrorsGrid Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type ScrollContentPresenter}},
+                                                                  Path=ActualWidth,
+                                                                  Converter={StaticResource SubtractConstantConverter},
+                                                                  ConverterParameter=6}"
+                                                  HorizontalAlignment="Left"
+                                                  Background="Transparent"
+                                                  MouseLeftButtonDown="DataGridRowDetailsOnMouseLeftButtonDown"
+                                                  ProjectItem="{Binding}"
+                                                  MaxHeight="100" />
+            </DataTemplate>
+        </DataGrid.RowDetailsTemplate>
+    </DataGrid>
+</UserControl>
diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml.cs b/src/BuildVision.UI/Components/ProjectGrid.xaml.cs
new file mode 100644
index 00000000..54c595ba
--- /dev/null
+++ b/src/BuildVision.UI/Components/ProjectGrid.xaml.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using BuildVision.UI.Converters;
+using BuildVision.UI.ViewModels;
+
+namespace BuildVision.UI.Components
+{
+    /// <summary>
+    /// Interaction logic for ProjectGrid.xaml
+    /// </summary>
+    public partial class ProjectGrid : UserControl
+    {
+        private BuildVisionPaneViewModel _viewModel;
+
+        public ProjectGrid()
+        {
+            InitializeComponent();
+        }
+
+        private void GridOnTargetUpdated(object sender, DataTransferEventArgs e)
+        {
+            if (e.Property.Name == "ItemsSource")
+                RefreshSortDirectionInGrid();
+        }
+
+        private void RefreshSortDirectionInGrid()
+        {
+            //DataGridColumn dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == _viewModel.GridSortDescription.Property);
+            //if (dataGridColumn != null)
+            //    dataGridColumn.SortDirection = _viewModel.GridSortDescription.Order.ToSystem();
+        }
+
+        private void GridOnSorting(object sender, DataGridSortingEventArgs e)
+        {
+            if (_viewModel.GridSorting.CanExecute(e))
+                _viewModel.GridSorting.Execute(e);
+        }
+
+        private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            //Debug.Assert(DataContext != null);
+
+            _viewModel = (BuildVisionPaneViewModel) DataContext;
+            //_viewModel.SetGridColumnsRef(Grid.Columns);
+            //_viewModel.PropertyChanged += ViewModelOnPropertyChanged;
+        }
+
+        private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            //TODO implement logic for scrolling tu currentproject
+            //if (_viewModel.CurrentProject != null && e.PropertyName == "CurrentProject")
+            //{
+            //    // TODO: Remove SelectedIndex = -1 and implement Unselect row feature by clicking on selected row.
+            //    Grid.SelectedIndex = -1;
+
+            //    if (Grid.SelectedIndex == -1)
+            //        Grid.ScrollIntoView(_viewModel.CurrentProject);
+            //}
+        }
+
+        private void DataGridExpanderOnExpanded(object sender, RoutedEventArgs e)
+        {
+            ExpanderIsExpandedConverter.SaveState(
+                (Expander) sender,
+                false,
+                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
+            e.Handled = true;
+        }
+
+        private void DataGridExpanderOnCollapsed(object sender, RoutedEventArgs e)
+        {
+            ExpanderIsExpandedConverter.SaveState(
+                (Expander) sender,
+                true,
+                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
+            e.Handled = true;
+        }
+
+        // Send scrolling to the DataGrid.
+        private void DataGridExpanderOnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            e.Handled = true;
+            var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta)
+            {
+                RoutedEvent = MouseWheelEvent,
+                Source = sender
+            };
+
+            var parent = (UIElement) VisualTreeHelper.GetParent((DependencyObject) sender);
+            parent.RaiseEvent(eventArg);
+        }
+
+        private void DataGridRowDetailsOnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            // http://stackoverflow.com/questions/6279724/mousedoubleclick-events-dont-bubble/6326181#6326181)
+            if (e.ClickCount == 2)
+                e.Handled = true;
+        }
+
+        // Autofocus for RowDetails (without extra mouse click).
+        private void DataGridRowOnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            var row = (DataGridRow) sender;
+            if (!row.IsSelected && e.Source is DataGridDetailsPresenter)
+            {
+                row.Focusable = true;
+                row.Focus();
+
+                // Gets the element with keyboard focus.
+                var elementWithFocus = Keyboard.FocusedElement as UIElement;
+
+                // Change keyboard focus.
+                if (elementWithFocus != null)
+                {
+                    var request = new TraversalRequest(FocusNavigationDirection.Next);
+                    elementWithFocus.MoveFocus(request);
+                }
+            }
+        }
+    }
+}
diff --git a/src/BuildVision.UI/Models/BuildInformationModel.cs b/src/BuildVision.UI/Models/BuildInformationModel.cs
index 2dcf6b8e..72fbd072 100644
--- a/src/BuildVision.UI/Models/BuildInformationModel.cs
+++ b/src/BuildVision.UI/Models/BuildInformationModel.cs
@@ -56,7 +56,7 @@ public int WarnedProjectsCount
             set => SetProperty(ref _warnedProjectsCount, value);
         }
 
-        private string _stateMessage = "";
+        private string _stateMessage = Resources.BuildDoneText_BuildNotStarted;
         public string StateMessage
         {
             get => _stateMessage;
diff --git a/src/BuildVision.UI/Models/ProjectItem.cs b/src/BuildVision.UI/Models/ProjectItem.cs
index 63212f1a..bbdfd149 100644
--- a/src/BuildVision.UI/Models/ProjectItem.cs
+++ b/src/BuildVision.UI/Models/ProjectItem.cs
@@ -172,11 +172,11 @@ public ErrorsBox ErrorsBox
             }
         }
 
-        [GridColumn("ProjectItemHeader_ErrorsCount", ColumnsOrder.ErrorsCount, true, ImageDictionaryUri = "Resources/ValueIndicator.Resources.xaml", ImageKey = "ErrorsIndicator", ExampleValue = 4)]
+        [GridColumn("ProjectItemHeader_ErrorsCount", ColumnsOrder.ErrorsCount, true, ImageDictionaryUri = "Resources/ValueIndicator.Resources.xaml", ImageKey = "ErrorsIndicatorIcon", ExampleValue = 4)]
         public int ErrorsCount => ErrorsBox.ErrorsCount;
-        [GridColumn("ProjectItemHeader_WarningsCount", ColumnsOrder.WarningsCount, true, ImageDictionaryUri = "Resources/ValueIndicator.Resources.xaml", ImageKey = "WarningsIndicator", ExampleValue = 1253)]
+        [GridColumn("ProjectItemHeader_WarningsCount", ColumnsOrder.WarningsCount, true, ImageDictionaryUri = "Resources/ValueIndicator.Resources.xaml", ImageKey = "WarningsIndicatorIcon", ExampleValue = 1253)]
         public int WarningsCount => ErrorsBox.WarningsCount;
-        [GridColumn("ProjectItemHeader_MessagesCount", ColumnsOrder.MessagesCount, false, ImageDictionaryUri = "Resources/ValueIndicator.Resources.xaml", ImageKey = "MessagesIndicator", ExampleValue = 2)]
+        [GridColumn("ProjectItemHeader_MessagesCount", ColumnsOrder.MessagesCount, false, ImageDictionaryUri = "Resources/ValueIndicator.Resources.xaml", ImageKey = "MessagesIndicatorIcon", ExampleValue = 2)]
         public int MessagesCount => ErrorsBox.MessagesCount;
 
         private string _framework;
diff --git a/src/BuildVision.UI/Styles/ControlViewStyle.xaml b/src/BuildVision.UI/Styles/ControlViewStyle.xaml
index 514fe5c3..5de91183 100644
--- a/src/BuildVision.UI/Styles/ControlViewStyle.xaml
+++ b/src/BuildVision.UI/Styles/ControlViewStyle.xaml
@@ -32,17 +32,8 @@
     </Style>
 
     <Style x:Key="IndicatorLabel">
-
-        <Setter Property="Label.Foreground"
-                Value="{DynamicResource ToolWindowTextKey}" />
-
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding IsEnabled}"
-                         Value="false">
-                <Setter Property="Label.Opacity"
-                        Value="0.4" />
-            </DataTrigger>
-        </Style.Triggers>
+        <Setter Property="Label.Foreground" Value="{DynamicResource ToolWindowTextKey}" />
+        <Setter Property="Label.Opacity" Value="0.4" />
     </Style>
 
     <converters1:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
diff --git a/src/BuildVision.UI/Themes/Generic.xaml b/src/BuildVision.UI/Themes/Generic.xaml
index 8c696e32..485f17df 100644
--- a/src/BuildVision.UI/Themes/Generic.xaml
+++ b/src/BuildVision.UI/Themes/Generic.xaml
@@ -64,6 +64,8 @@
     </Style>
 
     <Style TargetType="{x:Type ui:CancelButton}">
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+        <Setter Property="MinWidth" Value="66"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ui:CancelButton">
@@ -71,6 +73,7 @@
                         ToolTip="{x:Static res:Resources.CleanSolutionButtonTooltip}">
                         <StackPanel Orientation="Horizontal">
                             <ContentControl Template="{StaticResource CancelBuildSolutionIcon}" />
+                            <TextBlock Margin="2,0,0,0" Text="{x:Static res:Resources.CancelBuildSolutionButtonCaption}" />
                         </StackPanel>
                         <Button.Style>
                             <Style TargetType="Button" BasedOn="{StaticResource ToolBarButtonBaseStyle}" />
@@ -186,7 +189,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type indicators:ErrorsIndicator}">
                     <StackPanel Orientation="Vertical">
-                        <Grid ToolTip="{x:Static res:Resources.ErrorsIndicator_Header}">
+                        <Grid ToolTip="{x:Static res:Resources.ErrorsIndicator_Header}" ToolTipService.ShowOnDisabled="True">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
@@ -211,7 +214,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type indicators:WarningsIndicator}">
                     <StackPanel Orientation="Vertical">
-                        <Grid ToolTip="{x:Static res:Resources.WarningsIndicator_Header}">
+                        <Grid ToolTip="{x:Static res:Resources.WarningsIndicator_Header}" ToolTipService.ShowOnDisabled="True">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
@@ -236,7 +239,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type indicators:MessagesIndicator}">
                     <StackPanel Orientation="Vertical">
-                        <Grid ToolTip="{x:Static res:Resources.MessagesIndicator_Header}">
+                        <Grid ToolTip="{x:Static res:Resources.MessagesIndicator_Header}" ToolTipService.ShowOnDisabled="True">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
diff --git a/src/BuildVision.UI/ViewModels/BuildProgressViewModel.cs b/src/BuildVision.UI/ViewModels/BuildProgressViewModel.cs
index e47eb962..42d93828 100644
--- a/src/BuildVision.UI/ViewModels/BuildProgressViewModel.cs
+++ b/src/BuildVision.UI/ViewModels/BuildProgressViewModel.cs
@@ -9,13 +9,14 @@
 using BuildVision.UI.Models;
 using BuildVision.UI.Settings.Models.BuildProgress;
 using BuildVision.Contracts.Models;
+using BuildVision.Contracts;
 
 namespace BuildVision.UI.ViewModels
 { 
     public class BuildProgressViewModel : BindableBase, IBuildProgressViewModel
     {
         private readonly ControlSettings _settings;
-
+        private readonly IBuildInformationModel _buildInformationModel;
         private CancellationTokenSource _resetTaskBarInfoCts;
 
         private int _projectsCount;
@@ -26,26 +27,13 @@ public class BuildProgressViewModel : BindableBase, IBuildProgressViewModel
 
         private bool _actionProgressIsMarquee;
 
-        private bool _actionProgressIsError;
-
-
         private readonly Lazy<TaskbarItemInfo> _taskbarItemInfo = new Lazy<TaskbarItemInfo>(() =>
         {
             var window = Application.Current.MainWindow;
             return window.TaskbarItemInfo ?? (window.TaskbarItemInfo = new TaskbarItemInfo());
         });
         private TaskbarItemInfo TaskbarItemInfo => _taskbarItemInfo.Value;
-
-
-        private int _currentQueuePosOfBuildingProject;
-        public int CurrentQueuePosOfBuildingProject => _currentQueuePosOfBuildingProject;
-
-        private bool _actionProgressIsVisible;
-        public bool ActionProgressIsVisible
-        {
-            get => _actionProgressIsVisible; 
-            set => SetProperty(ref _actionProgressIsVisible, value);
-        }
+        public int CurrentQueuePosOfBuildingProject { get; private set; }
 
         private bool _actionProgressIsPaused;
         public bool ActionProgressIsPaused
@@ -54,9 +42,10 @@ public bool ActionProgressIsPaused
             set => SetProperty(ref _actionProgressIsPaused, value);
         }
 
-        public BuildProgressViewModel(ControlSettings settings)
+        public BuildProgressViewModel(ControlSettings settings, IBuildInformationModel buildInformationModel)
         {
             _settings = settings;
+            _buildInformationModel = buildInformationModel;
         }
 
         private void UpdateTaskBarInfo()
@@ -66,13 +55,13 @@ private void UpdateTaskBarInfo()
 
             TaskbarItemProgressState state;
 
-            if (!_actionProgressIsVisible)
+            if (_buildInformationModel.CurrentBuildState != BuildState.InProgress)
                 state = TaskbarItemProgressState.None;
             else if (_actionProgressIsPaused)
                 state = TaskbarItemProgressState.Paused;
             else if (_actionProgressIsMarquee)
                 state = TaskbarItemProgressState.Indeterminate;
-            else if (_actionProgressIsError)
+            else if (_buildInformationModel.CurrentBuildState == BuildState.Failed)
                 state = TaskbarItemProgressState.Error;
             else
                 state = TaskbarItemProgressState.Normal;
@@ -107,12 +96,10 @@ public void OnBuildBegin(int projectsCount)
                 _incProgressValue = 0;
             }
 
-            _currentQueuePosOfBuildingProject = 0;
+            CurrentQueuePosOfBuildingProject = 0;
             _actionProgressValue = 0;
-            _actionProgressIsError = false;
             _actionProgressIsMarquee = true;
             ActionProgressIsPaused = false;
-            ActionProgressIsVisible = true;
 
             UpdateTaskBarInfo();
         }
@@ -129,15 +116,12 @@ public void OnBuildProjectBegin()
                 _actionProgressIsMarquee = true;
             }
 
-            _currentQueuePosOfBuildingProject += 1;
+            CurrentQueuePosOfBuildingProject += 1;
             UpdateTaskBarInfo();
         }
 
         public void OnBuildProjectDone(bool success)
         {
-            if (!success)
-                _actionProgressIsError = true;
-
             if (_projectsCount > 0)
             {
                 _actionProgressIsMarquee = false;
@@ -156,10 +140,7 @@ public void OnBuildDone()
             _actionProgressValue = 1;
             _actionProgressIsMarquee = false;
             UpdateTaskBarInfo();
-
-            ActionProgressIsVisible = false;
             _actionProgressValue = 0;
-
             ResetTaskBarInfoOnBuildDone();
         }
 
diff --git a/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs b/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
index 87a3e150..7afcf001 100644
--- a/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
+++ b/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
@@ -48,6 +48,8 @@ public bool HideUpToDateTargets
 
         public ControlSettings ControlSettings { get; }
 
+        public ObservableCollection<IProjectItem> Projects { get; set; }
+
         public IBuildInformationModel BuildInformationModel { get; set; }
 
         public string GridGroupPropertyName
@@ -147,7 +149,7 @@ public ListCollectionView GroupedProjectsList
         {
             get
             {
-                var groupedList = new ListCollectionView(new List<object>()); // todo use projects here ProjectsList);
+                var groupedList = new ListCollectionView(Projects); // todo use projects here ProjectsList);
 
                 if (!string.IsNullOrWhiteSpace(GridGroupPropertyName))
                 {
@@ -183,6 +185,7 @@ public DataGridHeadersVisibility GridHeadersVisibility
 
         private ProjectItem _selectedProjectItem;
         private readonly IBuildService _buildManager;
+        private readonly IBuildingProjectsProvider _buildingProjectsProvider;
         private readonly IBuildInformationProvider _buildInformationProvider;
 
         public ProjectItem SelectedProjectItem
@@ -192,14 +195,16 @@ public ProjectItem SelectedProjectItem
         }
 
         [ImportingConstructor]
-        public BuildVisionPaneViewModel(IBuildService buildManager, IBuildInformationProvider buildInformationProvider, IPackageSettingsProvider settingsProvider, ISolutionProvider solutionProvider)
+        public BuildVisionPaneViewModel(IBuildService buildManager, IBuildingProjectsProvider buildingProjectsProvider, IBuildInformationProvider buildInformationProvider, IPackageSettingsProvider settingsProvider, ISolutionProvider solutionProvider)
         {
             _buildManager = buildManager;
+            _buildingProjectsProvider = buildingProjectsProvider;
             _buildInformationProvider = buildInformationProvider;
             BuildInformationModel = _buildInformationProvider.GetBuildInformationModel();
-            BuildProgressViewModel = new BuildProgressViewModel(ControlSettings);
+            BuildProgressViewModel = new BuildProgressViewModel(ControlSettings, BuildInformationModel);
             SolutionModel = solutionProvider.GetSolutionModel();
             ControlSettings = settingsProvider.Settings;
+            Projects = _buildingProjectsProvider.GetBuildingProjects();
         }
 
         /// <summary>
@@ -208,9 +213,10 @@ public BuildVisionPaneViewModel(IBuildService buildManager, IBuildInformationPro
         internal BuildVisionPaneViewModel()
         {
             ControlSettings = new ControlSettings();
-            BuildProgressViewModel = new BuildProgressViewModel(ControlSettings);
             BuildInformationModel = new BuildInformationModel();
+            BuildProgressViewModel = new BuildProgressViewModel(ControlSettings, BuildInformationModel);
             SolutionModel = new SolutionModel();
+            Projects = new ObservableCollection<IProjectItem>();
         }
 
         private void OpenContainingFolder()
diff --git a/src/BuildVision/Core/BuildVisionPane.cs b/src/BuildVision/Core/BuildVisionPane.cs
index 47f299da..05e05b95 100644
--- a/src/BuildVision/Core/BuildVisionPane.cs
+++ b/src/BuildVision/Core/BuildVisionPane.cs
@@ -77,7 +77,7 @@ async Task<BuildVisionPaneViewModel> InitializeAsync(AsyncPackage asyncPackage)
                 var packageSettingsProvider = await sp.GetServiceAsync(typeof(IPackageSettingsProvider)) as IPackageSettingsProvider;
                 Assumes.Present(packageSettingsProvider);
 
-                var viewModel = new BuildVisionPaneViewModel(buildService, buildInformationProvider, packageSettingsProvider, solutionProvider);
+                var viewModel = new BuildVisionPaneViewModel(buildService, buildingProjectsProvider, buildInformationProvider, packageSettingsProvider, solutionProvider);
          
                 View = CreateControlView();
                 View.DataContext = viewModel;