diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml b/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
index f2092d4d5e..195f5e5e81 100644
--- a/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
+++ b/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
@@ -42,10 +42,10 @@
 		
 		<Style x:Key="expanderHeaderTextStyle" TargetType="{x:Type TextBlock}">
 			<Style.Triggers>
-				<DataTrigger Binding="{Binding IsExpandedInView}" Value="True">
+				<!--				<DataTrigger Binding="{Binding IsExpandedInView}" Value="True">
 					<Setter Property="Background" Value="{x:Static SystemColors.HighlightBrush}" />
 					<Setter Property="Foreground" Value="{x:Static SystemColors.HighlightTextBrush}" />
-				</DataTrigger>
+				</DataTrigger>-->
 				<DataTrigger Binding="{Binding HasHighlightCount}" Value="True">
 					<Setter Property="FontWeight" Value="Bold" />
 				</DataTrigger>
@@ -73,19 +73,31 @@
 			</TextBlock>
 		</DataTemplate>
 		
+		<Style x:Key="viewModelExpanderStyle" TargetType="{x:Type Expander}">
+			<Style.Triggers>
+				<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsExpanded}" Value="True">
+					<Setter Property="Background" Value="White" />
+					<Setter Property="BorderBrush" Value="Black" />
+					<Setter Property="BorderThickness" Value="1" />
+					<Setter Property="Padding" Value="2" />
+					<Setter Property="Margin" Value="0,0,0,10" />
+				</DataTrigger>
+			</Style.Triggers>
+		</Style>
+		
 		<DataTemplate x:Key="viewModelExpanderItemTemplate" DataType="{x:Type aimvm:AddInsViewModelBase}">
 			<Expander
 				Header="{Binding}"
 				HeaderTemplate="{StaticResource expanderHeaderTemplate}"
-				IsExpanded="{Binding IsExpandedInView}"
-				Margin="0,0,0,10">
+				Style="{StaticResource viewModelExpanderStyle}"
+				IsExpanded="{Binding IsExpandedInView}">
 				<ListBox
 					ItemsSource="{Binding PackageRepositories}"
 					ItemTemplate="{StaticResource packageRepositoryItemTemplate}"
 					SelectedItem="{Binding Path=SelectedPackageSource}"
 					BorderThickness="0"
 					Background="Transparent"
-					Margin="3,0,0,0"
+					Margin="0,0,0,0"
 					ScrollViewer.HorizontalScrollBarVisibility="Hidden"
 				/>
 			</Expander>
diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml b/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml
index 28216f545c..9acd6404d9 100644
--- a/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml
+++ b/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml
@@ -466,7 +466,7 @@
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition MinWidth="100"/>
 			<ColumnDefinition Width="Auto"/>
-			<ColumnDefinition MinWidth="100"/>
+			<ColumnDefinition Width=".6*" MinWidth="100"/>
 		</Grid.ColumnDefinitions>