diff --git a/Application/AnnotationPlane/ColumnSettings/ColumnDefinitionView.xaml b/Application/AnnotationPlane/ColumnSettings/ColumnDefinitionView.xaml
index 51902ac..87fc38f 100644
--- a/Application/AnnotationPlane/ColumnSettings/ColumnDefinitionView.xaml
+++ b/Application/AnnotationPlane/ColumnSettings/ColumnDefinitionView.xaml
@@ -37,10 +37,10 @@
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="auto" SharedSizeGroup="ColumnDefinitionWidth1"/>
-            <ColumnDefinition Width="auto" SharedSizeGroup="ColumnDefinitionWidth2"/>
-            <ColumnDefinition Width="auto" SharedSizeGroup="ColumnDefinitionWidth3"/>
-            <ColumnDefinition Width="auto" SharedSizeGroup="ColumnDefinitionWidth4"/>
+            <ColumnDefinition SharedSizeGroup="ColumnDefinitionWidth1" Width="Auto"/>
+            <ColumnDefinition SharedSizeGroup="ColumnDefinitionWidth2" Width="Auto"/>
+            <ColumnDefinition SharedSizeGroup="ColumnDefinitionWidth3" Width="*"/>
+            <ColumnDefinition SharedSizeGroup="ColumnDefinitionWidth4" Width="Auto"/>
         </Grid.ColumnDefinitions>
         <Button FontSize="20" Grid.Column="0" Visibility="{Binding CanMoveLeft,Converter={StaticResource visibilityHiddenConverter}}" CommandParameter="{Binding ColumnOrder}" Command="{Binding MoveLeft}" Style="{StaticResource MetroButton}" Width="50" VerticalAlignment="Center">
             <media:Arrow_In_circle>
@@ -53,8 +53,9 @@
             <media:Arrow_In_circle>
             </media:Arrow_In_circle>
         </Button>
-        <ContentPresenter Grid.Column="2"  Content="{Binding .}" Margin="3" />
-        <Button FontSize="20" Grid.Column="3" Command="{Binding RemoveCommand}"  CommandParameter="{Binding ColumnOrder}" Style="{StaticResource MetroButton}" Width="50" VerticalAlignment="Center">
+        <ContentPresenter Content="{Binding .}" Margin="3" Grid.Column="2"/>
+        <Button FontSize="20" Grid.Column="3" Command="{Binding RemoveCommand}"  CommandParameter="{Binding ColumnOrder}"
+                Style="{StaticResource MetroButton}" Width="50" VerticalAlignment="Center" HorizontalAlignment="Right">
             <media:CrossIcon/>
         </Button>
     </Grid>
diff --git a/Application/AnnotationPlane/ColumnSettings/ColumnSettingsView.xaml b/Application/AnnotationPlane/ColumnSettings/ColumnSettingsView.xaml
index 5510655..2756334 100644
--- a/Application/AnnotationPlane/ColumnSettings/ColumnSettingsView.xaml
+++ b/Application/AnnotationPlane/ColumnSettings/ColumnSettingsView.xaml
@@ -12,17 +12,32 @@
             <local:ColumnDefinitionView HorizontalAlignment="Center" />
         </DataTemplate>
     </UserControl.Resources>
-    <Grid>
-        <Grid VerticalAlignment="Stretch" HorizontalAlignment="Center">
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
-            <ScrollViewer Grid.Row="0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" FlowDirection="RightToLeft">
-                <ItemsControl HorizontalAlignment="Right" ItemsSource="{Binding OrderedColumnDefinitions}"  VerticalAlignment="Center" Grid.IsSharedSizeScope="True" FlowDirection="LeftToRight"/>
-            </ScrollViewer>            
-            <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,30,0,30">
-                <TextBlock VerticalAlignment="Center" FontSize="20">Добавить колонку:</TextBlock>
+
+    <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <ScrollViewer Grid.Row="0" Grid.Column="0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" FlowDirection="RightToLeft" HorizontalAlignment="Stretch" PanningMode="Both">
+            <ItemsControl HorizontalAlignment="Right" ItemsSource="{Binding OrderedColumnDefinitions}" VerticalAlignment="Center" Grid.IsSharedSizeScope="True" FlowDirection="LeftToRight"/>
+        </ScrollViewer>
+
+        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right">
+            <Button Style="{StaticResource MetroButton}" HorizontalAlignment="Right" Width="50" Height="50" Command="{Binding ActivateAnnotationPlaneCommand}">
+                <media:TableIcon></media:TableIcon>
+            </Button>
+            <Button Style="{StaticResource MetroButton}" Command="{Binding ImportFromFileCommnad}" Content="Загрузить столбцы"/>
+            <Button Style="{StaticResource MetroButton}" Command="{Binding ExportToFileCommand}" Content="Сохранить столбцы"/>
+        </StackPanel>
+
+        <ScrollViewer Grid.Row="1" Grid.ColumnSpan="2" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" VerticalAlignment="Center" Margin="5,10,0,10">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock VerticalAlignment="Center" FontSize="17">Добавить колонку:</TextBlock>
                 <WrapPanel>
                     <Button Style="{StaticResource MetroButton}" Command="{Binding AddDepthCommand}">Шкала глубин</Button>
                     <Button Style="{StaticResource MetroButton}" Command="{Binding AddPhotoCommand}">Фото</Button>
@@ -34,14 +49,7 @@
                     <Button Style="{StaticResource MetroButton}" Command="{Binding AddIconsCommand}">Значки</Button>
                 </WrapPanel>
             </StackPanel>
-        </Grid>
-        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Right">
-            <Button Style="{StaticResource MetroButton}" HorizontalAlignment="Right" Width="50" Height="50" Command="{Binding ActivateAnnotationPlaneCommand}">
-                <media:TableIcon></media:TableIcon>
-            </Button>
-            <Button Style="{StaticResource MetroButton}" Command="{Binding ImportFromFileCommnad}" Content="Загрузить столбцы"/>
-            <Button Style="{StaticResource MetroButton}" Command="{Binding ExportToFileCommand}" Content="Сохранить столбцы"/>
-        </StackPanel>
+        </ScrollViewer>
 
     </Grid>
 </UserControl>
diff --git a/Application/AnnotationPlane/ColumnSettings/VisualColumnDefinitionView.xaml b/Application/AnnotationPlane/ColumnSettings/VisualColumnDefinitionView.xaml
index 399a991..eb883d2 100644
--- a/Application/AnnotationPlane/ColumnSettings/VisualColumnDefinitionView.xaml
+++ b/Application/AnnotationPlane/ColumnSettings/VisualColumnDefinitionView.xaml
@@ -4,40 +4,43 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:CoreSampleAnnotation.AnnotationPlane.ColumnSettings"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
-    <StackPanel Orientation="Horizontal">
-        <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center">Крап</TextBlock>
-        <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="15" ItemsSource="{Binding AvailableBackgroundImageProps}" SelectedItem="{Binding SelectedBackgroundImageProp}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding PropertyName}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-        <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center" Margin="15,0,0,0">Ширина</TextBlock>
-        <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="15" ItemsSource="{Binding AvailableWidthProps}" SelectedItem="{Binding SelectedWidthProp}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding PropertyName}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-        <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center" Margin="15,0,0,0">Правая граница</TextBlock>
-        <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="15" ItemsSource="{Binding AvailableRightSideProps}" SelectedItem="{Binding SelectedRightSideProp}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding PropertyName}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-        <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center" Margin="15,0,0,0">Нижняя граница</TextBlock>
-        <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="15" ItemsSource="{Binding AvailableBottomSideProps}" SelectedItem="{Binding SelectedBottomSideProp}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding PropertyName}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
+             mc:Ignorable="d">
+    <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="0,15,0,15">
+        <StackPanel  Orientation="Horizontal" Margin="0,5,0,0">
+            <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center">Крап</TextBlock>
+            <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="5,0,0,0" ItemsSource="{Binding AvailableBackgroundImageProps}" SelectedItem="{Binding SelectedBackgroundImageProp}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding PropertyName}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center" Margin="5,0,0,0">Ширина</TextBlock>
+            <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="5,0,0,0" ItemsSource="{Binding AvailableWidthProps}" SelectedItem="{Binding SelectedWidthProp}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding PropertyName}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </StackPanel>
+        <StackPanel  Orientation="Horizontal" Margin="0,5,0,0">
+            <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center">Правая граница</TextBlock>
+            <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="5,0,0,0" ItemsSource="{Binding AvailableRightSideProps}" SelectedItem="{Binding SelectedRightSideProp}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding PropertyName}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <TextBlock VerticalAlignment="Center" FontSize="20"  HorizontalAlignment="Center" Margin="5,0,0,0">Нижняя граница</TextBlock>
+            <ComboBox VerticalAlignment="Center" FontSize="20" MinWidth="150" Margin="5,0,0,0" ItemsSource="{Binding AvailableBottomSideProps}" SelectedItem="{Binding SelectedBottomSideProp}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding PropertyName}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/Application/AnnotationPlane/Columns/Drawing.cs b/Application/AnnotationPlane/Columns/Drawing.cs
index a7d29cc..aeb2f94 100644
--- a/Application/AnnotationPlane/Columns/Drawing.cs
+++ b/Application/AnnotationPlane/Columns/Drawing.cs
@@ -20,12 +20,12 @@ public static IEnumerable<Point> GetRightPolyline(double width, double height, I
             return result;
         }
 
-        public static IEnumerable<Point> GetBottomPolyline(double width, double height, ISideCurveGenerator bottomSideCurve)
+        public static IEnumerable<Point> GetBottomPolyline(double xOffset, double width, double height, ISideCurveGenerator bottomSideCurve)
         {
             List<Point> result = new List<Point>();
 
             IEnumerable<Point> bottomSidePoints = bottomSideCurve.GenerateSide(width).
-                Select(p => new Point(p.X, p.Y + height)); // parallel shift, so that (0.0;0.0);(width;0.0) is shifted to (0.0;height);(width;height)
+                Select(p => new Point(p.X + xOffset, p.Y + height)); // parallel shift, so that (0.0;0.0);(width;0.0) is shifted to (0.0;height);(width;height)
 
             result.AddRange(bottomSidePoints);
 
@@ -78,24 +78,29 @@ public interface IOscillationGenerator
         IEnumerable<Point> GeneratePeriod(double xPeriod, double signalMaxY);
     }
 
+    public enum OscillationAlignment { Left, Center, Right }
+
     /// <summary>
     /// Generates a side curve by repeating integer repeating periods provided by oscillationGenerator
     /// </summary>
     public class OscillatingSignalCurveGenerator : ISideCurveGenerator
     {
         private double xPeriod, signalMaxY;
+        private OscillationAlignment alignment;
         IOscillationGenerator generator;
 
         /// <param name="xPeriod">The period of the pattern allong X axis</param>
-        /// <param name="signalMaxY">the avsolute hight of the pattern along Y axis</param>
+        /// <param name="signalMaxY">the absolute hight of the pattern along Y axis</param>
         /// <param name="generator">Which signal to generate</param>
-        public OscillatingSignalCurveGenerator(double xPeriod, double signalMaxY, IOscillationGenerator generator)
+        /// <param name="alignment">Where the straight part will be / where to stick the signal curve</param>
+        public OscillatingSignalCurveGenerator(double xPeriod, double signalMaxY, IOscillationGenerator generator, OscillationAlignment alignment)
         {
             if (signalMaxY < 0)
                 throw new ArgumentException("signalMaxY must be non-negative");
             this.xPeriod = xPeriod;
             this.signalMaxY = signalMaxY;
             this.generator = generator;
+            this.alignment = alignment;
         }
 
         public IEnumerable<Point> GenerateSide(double length)
@@ -104,15 +109,35 @@ public IEnumerable<Point> GenerateSide(double length)
             double straitEndsLength = length - periods * xPeriod;
 
             List<Point> result = new List<Point>();
+
+            double leftOffset = 0.0;
+            double rightOffset = 0.0;
+            switch (alignment)
+            {
+                case OscillationAlignment.Center:
+                    leftOffset = straitEndsLength / 2;
+                    rightOffset = straitEndsLength / 2;
+                    break;
+                case OscillationAlignment.Left:
+                    leftOffset = 0.0;
+                    rightOffset = straitEndsLength;
+                    break;
+                case OscillationAlignment.Right:
+                    leftOffset = straitEndsLength;
+                    rightOffset = 0.0;
+                    break;
+            }
+
+
             //starting straight line
             result.Add(new Point(0.0, 0.0));
-            result.Add(new Point(straitEndsLength * 0.5, 0.0));
+            result.Add(new Point(leftOffset, 0.0));
 
             //drawing curves
             double miniStep = xPeriod * 0.5;
             for (int i = 0; i < periods; i++)
             {
-                double xOffset = straitEndsLength * 0.5 + i * xPeriod;
+                double xOffset = leftOffset + i * xPeriod;
                 IEnumerable<Point> periodPoints = generator.GeneratePeriod(xPeriod, signalMaxY).Select(p => new Point(p.X + xOffset, p.Y));
 
                 result.AddRange(periodPoints);
diff --git a/Application/AnnotationPlane/Columns/VisualColumnView.xaml b/Application/AnnotationPlane/Columns/VisualColumnView.xaml
index 22d233d..aa7f8e1 100644
--- a/Application/AnnotationPlane/Columns/VisualColumnView.xaml
+++ b/Application/AnnotationPlane/Columns/VisualColumnView.xaml
@@ -43,13 +43,13 @@
                     <Polyline Stroke="Black" StrokeThickness="1" StrokeDashCap="Round">
                         <Polyline.Points>
                             <MultiBinding Converter="{StaticResource bottomSidePointsConverter}">
+                                <Binding RelativeSource="{RelativeSource Mode=PreviousData}" Path="BottomSideForm"></Binding>
                                 <Binding Path="Width"></Binding>
-                                <Binding Path="Height"></Binding>
-                                <Binding Path="BottomSideForm"></Binding>
+                                <Binding RelativeSource="{RelativeSource Mode=PreviousData}" Path="Width"></Binding>
                             </MultiBinding>
                         </Polyline.Points>
                         <Polyline.StrokeDashArray>
-                            <Binding Converter="{StaticResource bottomSideStrokeConverter}" Path="BottomSideForm"/>
+                            <Binding Converter="{StaticResource bottomSideStrokeConverter}" Path="BottomSideForm" RelativeSource="{RelativeSource Mode=PreviousData}"/>
                         </Polyline.StrokeDashArray>
                     </Polyline>
                     <Polygon Fill="{Binding BackgroundBrush}" Stroke="Transparent">
diff --git a/Application/AnnotationPlane/Columns/VisualColumnView.xaml.cs b/Application/AnnotationPlane/Columns/VisualColumnView.xaml.cs
index 65f185a..31fef39 100644
--- a/Application/AnnotationPlane/Columns/VisualColumnView.xaml.cs
+++ b/Application/AnnotationPlane/Columns/VisualColumnView.xaml.cs
@@ -38,30 +38,41 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
     public static class SideCurveGeneratorFactory
     {
         private static ISideCurveGenerator straight = new StraightSideCurveGenerator();
-        private static ISideCurveGenerator steps = new OscillatingSignalCurveGenerator(20, 3, new StepOscillationGenerator());
-        private static ISideCurveGenerator wave = new OscillatingSignalCurveGenerator(20, 3, new SinOscillationGenerator(11));
-        private static ISideCurveGenerator zigzag = new OscillatingSignalCurveGenerator(20, 3, new ZigZagOscillationGenerator());
+        private static ISideCurveGenerator stepsVertical = new OscillatingSignalCurveGenerator(20, 3, new StepOscillationGenerator(), OscillationAlignment.Center);
+        private static ISideCurveGenerator waveVertical = new OscillatingSignalCurveGenerator(20, 3, new SinOscillationGenerator(11), OscillationAlignment.Center);
+        private static ISideCurveGenerator zigzagVertical = new OscillatingSignalCurveGenerator(20, 3, new ZigZagOscillationGenerator(), OscillationAlignment.Center);
+        private static ISideCurveGenerator waveHorizontalLeft = new OscillatingSignalCurveGenerator(20, 3, new SinOscillationGenerator(11), OscillationAlignment.Left);
+        private static ISideCurveGenerator waveHorizontalRight = new OscillatingSignalCurveGenerator(20, 3, new SinOscillationGenerator(11), OscillationAlignment.Right);
+        private static ISideCurveGenerator waveHorizontalCenter = new OscillatingSignalCurveGenerator(20, 3, new SinOscillationGenerator(11), OscillationAlignment.Center);
 
 
         public static ISideCurveGenerator GetGeneratorFor(Template.RightSideFormEnum rightSideForm) {
             switch (rightSideForm) {
                 case Template.RightSideFormEnum.NotDefined: return straight;
                 case Template.RightSideFormEnum.Straight: return straight;
-                case Template.RightSideFormEnum.Steps: return steps;
-                case Template.RightSideFormEnum.Wave: return wave;
-                case Template.RightSideFormEnum.ZigZag: return zigzag;
+                case Template.RightSideFormEnum.Steps: return stepsVertical;
+                case Template.RightSideFormEnum.Wave: return waveVertical;
+                case Template.RightSideFormEnum.ZigZag: return zigzagVertical;
                 default:
                     throw new NotSupportedException("Unknown right side form");
             }
         }
 
-        public static ISideCurveGenerator GetGeneratorFor(Template.BottomSideFormEnum bottomSideForm)
+        public static ISideCurveGenerator GetGeneratorFor(Template.BottomSideFormEnum bottomSideForm, OscillationAlignment alignment)
         {
             switch (bottomSideForm)
             {
                 case Template.BottomSideFormEnum.NotDefined: return straight;
                 case Template.BottomSideFormEnum.Straight: return straight;
-                case Template.BottomSideFormEnum.Wave: return wave;
+                case Template.BottomSideFormEnum.Wave:
+                    switch (alignment)
+                    {
+                        case OscillationAlignment.Left: return waveHorizontalLeft;
+                        case OscillationAlignment.Right: return waveHorizontalRight;
+                        case OscillationAlignment.Center: return waveHorizontalCenter;
+                        default:
+                            throw new NotSupportedException("Unknown wave alignment");
+                    }
                 case Template.BottomSideFormEnum.Dotted: return straight;
                 default:
                     throw new NotSupportedException("Unknown bottom side form");
@@ -113,11 +124,21 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
         {
             if (values.Length != 3)
                 return null;
-            double width = (double)values[0];
-            double height = (double)values[1];
-            Template.BottomSideFormEnum bottomSideForm = (Template.BottomSideFormEnum)values[2];
-            ISideCurveGenerator bottomSideGenerator = SideCurveGeneratorFactory.GetGeneratorFor(bottomSideForm);
-            return new PointCollection(Drawing.GetBottomPolyline(width, height, bottomSideGenerator));
+            if (values[0] == DependencyProperty.UnsetValue) return new PointCollection();
+            Template.BottomSideFormEnum bottomSideForm = (Template.BottomSideFormEnum)values[0];
+            ISideCurveGenerator bottomRightAlignedSideGenerator = SideCurveGeneratorFactory.GetGeneratorFor(bottomSideForm, OscillationAlignment.Right);
+            ISideCurveGenerator bottomLeftAlignedSideGenerator = SideCurveGeneratorFactory.GetGeneratorFor(bottomSideForm, OscillationAlignment.Left);
+            double currentWidth = (double)values[1];
+            double previousWidth = (double)values[2];
+            // splitting the layer boundary into two fragments
+            // getting the minimum length between the two layers
+            double minCrepWidth = (currentWidth < previousWidth) ? currentWidth : previousWidth;
+            // getting the difference between the lengths
+            double crepWidthDiff = (currentWidth > previousWidth) ? currentWidth - minCrepWidth : previousWidth - minCrepWidth;
+            var bottomBoundaryRightAlign = Drawing.GetBottomPolyline(0.0, minCrepWidth, 0.0, bottomRightAlignedSideGenerator);
+            var bottomBoundaryLeftAlign = Drawing.GetBottomPolyline(minCrepWidth, crepWidthDiff, 0.0, bottomLeftAlignedSideGenerator);
+            var bottomBoundary = new PointCollection(bottomBoundaryRightAlign.Concat(bottomBoundaryLeftAlign));
+            return bottomBoundary;
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
@@ -137,10 +158,10 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                 case Template.BottomSideFormEnum.NotDefined:
                 case Template.BottomSideFormEnum.Straight:
                 case Template.BottomSideFormEnum.Wave:
-                    strokeArr = new DoubleCollection() { 3, 0 };
+                    strokeArr = new DoubleCollection() { 5, 0 };
                     break;
                 case Template.BottomSideFormEnum.Dotted:
-                    strokeArr = new DoubleCollection() { 3, 3 };
+                    strokeArr = new DoubleCollection() { 5, 5 };
                     break;
                 default:
                     break;
diff --git a/Application/Intervals/BoreIntervalsView.xaml b/Application/Intervals/BoreIntervalsView.xaml
index bbf1b8d..ec13d07 100644
--- a/Application/Intervals/BoreIntervalsView.xaml
+++ b/Application/Intervals/BoreIntervalsView.xaml
@@ -49,7 +49,7 @@
                                     <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="DataContext.EffectiveActivateIntervalImagesCommand" />
                                 </Button.Command>
                             </Button>
-                            <Button Grid.Column="5" Width="50" Height="50" Margin="20,0" CommandParameter="{Binding}" Background="{StaticResource ColorPrimary}">
+                            <Button Grid.Column="5" Width="50" Height="50" Margin="10,0" CommandParameter="{Binding}" Background="{StaticResource ColorPrimary}">
                                 <Button.Command>
                                     <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="DataContext.RemoveIntervalCommand" />
                                 </Button.Command>
diff --git a/Application/Reports/SVG/LayeredColumnPainter.cs b/Application/Reports/SVG/LayeredColumnPainter.cs
index 5f72b35..ba1a7ee 100644
--- a/Application/Reports/SVG/LayeredColumnPainter.cs
+++ b/Application/Reports/SVG/LayeredColumnPainter.cs
@@ -37,10 +37,10 @@ public override RenderedSvg RenderColumn()
             LayerVM[] layers = columnVm.Layers.ToArray();
             double boundary = 0.0;
             for (int i = 0; i < layers.Length; i++)
-            {                
+            {               
                 LayerVM lVM = layers[i];
+                boundary += lVM.Length; 
                 if (i < layers.Length - 1) {
-                    boundary += lVM.Length;
                     SvgLine line = new SvgLine();
                     line.Stroke = blackPaint;
                     line.StartX = Helpers.dtos(0.0);
@@ -49,6 +49,7 @@ public override RenderedSvg RenderColumn()
                     line.EndY = Helpers.dtos(boundary);
                     group.Children.Add(line);
                 }
+                // drawing layer itself
                 var layerSvg = layerPainter.Paint(layers[i], width, lVM.Length);
                 layerSvg.Transforms.Add(new Svg.Transforms.SvgTranslate(0.0f, (float)(boundary - lVM.Length)));
                 group.Children.Add(layerSvg);
diff --git a/Application/Reports/SVG/VisualColumnPainter.cs b/Application/Reports/SVG/VisualColumnPainter.cs
index 53c8837..a703c51 100644
--- a/Application/Reports/SVG/VisualColumnPainter.cs
+++ b/Application/Reports/SVG/VisualColumnPainter.cs
@@ -31,13 +31,10 @@ private static void AddPointToCollection(SvgPointCollection points, Point point)
 
         public override RenderedSvg RenderColumn()
         {
-            var result = base.RenderColumn();
-            
+            var result = base.RenderColumn();            
 
             SvgGroup group = new SvgGroup();
-            VisualLayerPresentingVM[] layers = vm.Layers.ToArray();
-
-            
+            VisualLayerPresentingVM[] layers = vm.Layers.ToArray();            
 
             for (int i = 0; i < layers.Length; i++)
             {
@@ -72,11 +69,18 @@ public override RenderedSvg RenderColumn()
                     levelGroup.Children.Add(rightEdge);
 
 
-                    ISideCurveGenerator bottomSideCurveGenerator = null;
+                    ISideCurveGenerator bottomSideLeftAlignedCurveGenerator = null;
+                    ISideCurveGenerator bottomSideRightAlignedCurveGenerator = null;
                     if ((lvm.BottomSideClass != null) && (lvm.BottomSideClass.CurrentClass != null))
-                        bottomSideCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(lvm.BottomSideClass.CurrentClass.BottomSideForm);
+                    {
+                        bottomSideLeftAlignedCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(lvm.BottomSideClass.CurrentClass.BottomSideForm, OscillationAlignment.Left);
+                        bottomSideRightAlignedCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(lvm.BottomSideClass.CurrentClass.BottomSideForm, OscillationAlignment.Right);
+                    }
                     else
-                        bottomSideCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(AnnotationPlane.Template.BottomSideFormEnum.NotDefined);
+                    {
+                        bottomSideLeftAlignedCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(AnnotationPlane.Template.BottomSideFormEnum.NotDefined, OscillationAlignment.Left);
+                        bottomSideRightAlignedCurveGenerator = SideCurveGeneratorFactory.GetGeneratorFor(AnnotationPlane.Template.BottomSideFormEnum.NotDefined, OscillationAlignment.Right);
+                    }
 
                     SvgPolyline bottomEdge = new SvgPolyline
                     {
@@ -88,12 +92,32 @@ public override RenderedSvg RenderColumn()
                     {
                         if (lvm.BottomSideClass.CurrentClass.BottomSideForm == AnnotationPlane.Template.BottomSideFormEnum.Dotted)
                         {
-                            bottomEdge.StrokeDashArray = new List<float>() { 3, 3 }.
-                                Select(p => new SvgUnit(p)) as SvgUnitCollection;
+                            var dashedCollection = new SvgUnitCollection();
+                            dashedCollection.AddRange(new[] { new SvgUnit(SvgUnitType.User, 5), new SvgUnit(SvgUnitType.User, 5) });
+                            bottomEdge.StrokeDashArray = dashedCollection;
                         }
                     }
 
-                    var bottomPoints = Drawing.GetBottomPolyline(lvm.Width, lvm.Height, bottomSideCurveGenerator).ToArray();
+                    double currentWidth = lvm.Width;
+                    double minCrepWidth = currentWidth;
+                    double crepWidthDiff = 0.0;
+                    if (i < layers.Length - 1)
+                    {
+                        VisualLayerPresentingVM nlvm = layers[i + 1];
+
+                        // splitting the layer boundary into two fragments
+                        // getting the minimum length between the two layers
+                        minCrepWidth = (currentWidth < nlvm.Width) ? currentWidth : nlvm.Width;
+                        // getting the difference between the lengths
+                        crepWidthDiff = (currentWidth > nlvm.Width) ? currentWidth - minCrepWidth : nlvm.Width - minCrepWidth;
+                    }
+
+                    var bottomPointsRightAligned = Drawing.GetBottomPolyline(0.0, minCrepWidth, lvm.Height, bottomSideRightAlignedCurveGenerator).ToArray();
+                    var bottomPointsLeftAligned = Drawing.GetBottomPolyline(minCrepWidth, crepWidthDiff, lvm.Height, bottomSideLeftAlignedCurveGenerator).ToArray();
+                    
+                    var bottomPoints = new Point[bottomPointsRightAligned.Length + bottomPointsLeftAligned.Length];
+                    bottomPointsRightAligned.CopyTo(bottomPoints, 0);
+                    bottomPointsLeftAligned.CopyTo(bottomPoints, bottomPointsRightAligned.Length);
 
                     SvgPointCollection svgBottomPoints = new SvgPointCollection();
                     for (int j = 0; j < bottomPoints.Length; j++)