diff --git a/WikiPreview.Fluent.Plugin/WikiPreviewSearchResult.cs b/WikiPreview.Fluent.Plugin/WikiPreviewSearchResult.cs
index 3b6f7b4..ad83e45 100644
--- a/WikiPreview.Fluent.Plugin/WikiPreviewSearchResult.cs
+++ b/WikiPreview.Fluent.Plugin/WikiPreviewSearchResult.cs
@@ -56,29 +56,20 @@ public WikiPreviewSearchResult(string resultName)
 
         private string WikiText { get; }
 
-        public string Url { get; set; }
-        public override string Context => WikiRootUrl + Url;
-
         public override void OnFocusLoad(ISearchResult old, bool hasUserInteracted)
         {
             UseCustomControl = true;
             var wikiDescription = new TextBlock
             {
-                Text = WikiText, Padding = new Thickness(0, 5, 0, 0), TextWrapping = TextWrapping.Wrap,
+                Text = WikiText, Padding = Thickness.Parse("0 10 0 0"), TextWrapping = TextWrapping.Wrap,
                 TextTrimming = TextTrimming.WordEllipsis
             };
 
             var stackPanel = new StackPanel();
-            var imageControl = new Border
+            var imageControl = new Image
             {
-                Background = new ImageBrush(PreviewImage.ConvertToAvaloniaBitmap())
-                {
-                    Stretch = Stretch.UniformToFill
-                },
-                CornerRadius = new CornerRadius(5.0),
-                BorderThickness = new Thickness(5.0),
-                Height = FixedImageSize,
-                Width = FixedImageSize
+                Source = PreviewImage.ConvertToAvaloniaBitmap(), MaxHeight = FixedImageSize,
+                MaxWidth = FixedImageSize
             };
 
             stackPanel.Children.Add(imageControl);
@@ -88,13 +79,16 @@ public override void OnFocusLoad(ISearchResult old, bool hasUserInteracted)
             {
                 Content = stackPanel,
                 MaxHeight = 200,
-                Margin = new Thickness(5.0),
+                Margin = Thickness.Parse("10"),
                 VerticalScrollBarVisibility = ScrollBarVisibility.Hidden
             };
 
             CustomControl = scrollViewer;
         }
 
+        public string Url { get; set; }
+        public override string Context => WikiRootUrl + Url;
+
         public static string GetFormattedUrl(QueryConfiguration queryConfiguration)
         {
             var builder =