diff --git a/HFUTCourseSimulation/Kernel/Render.cs b/HFUTCourseSimulation/Kernel/Render.cs
index 86e828b..2a17aa6 100644
--- a/HFUTCourseSimulation/Kernel/Render.cs
+++ b/HFUTCourseSimulation/Kernel/Render.cs
@@ -58,8 +58,8 @@ namespace HFUTCourseSimulation.Kernel {
             _weekWidthWithMargin = _weekWidth + 2 * MARGIN;
             _weekHeightWithMargin = _weekHeight + 2 * MARGIN;
 
-            _width = _weekWidth * _horizontalCount;
-            _height = _weekHeight * _verticalCount;
+            _width = _weekWidthWithMargin * _horizontalCount;
+            _height = _weekHeightWithMargin * _verticalCount;
         }
 
         int _horizontalCount, _verticalCount;
@@ -111,7 +111,7 @@ namespace HFUTCourseSimulation.Kernel {
 
         public Rectangle GetHeadbarBoxRect(int week) {
             var pos = GetTablePos(week);
-            return new Rectangle(pos, new Size(7 * CELL_WIDTH, HEADBAR_HEIGHT));
+            return new Rectangle(pos, new Size(SIDEBAR_WIDTH + 7 * CELL_WIDTH, HEADBAR_HEIGHT));
         }
 
         public Rectangle GetSidebarTextRect(int week, int index) {
diff --git a/HFUTCourseSimulation/Widget/ColorPicker.xaml b/HFUTCourseSimulation/Widget/ColorPicker.xaml
index 6b100e7..3821e16 100644
--- a/HFUTCourseSimulation/Widget/ColorPicker.xaml
+++ b/HFUTCourseSimulation/Widget/ColorPicker.xaml
@@ -41,9 +41,9 @@
 
         <TabControl Grid.Row="1" Margin="5">
             <TabItem Header="Material Design" Padding="5">
-                <WrapPanel x:Name="uiMdColorPresetList" Orientation="Horizontal">
-                    
-                </WrapPanel>
+                <ScrollViewer>
+                    <WrapPanel x:Name="uiMdColorPresetList" Orientation="Horizontal"/>
+                </ScrollViewer>
             </TabItem>
             <TabItem Header="Flat UI" Padding="5"/>
             <TabItem Header="Fluent" Padding="5"/>