diff --git a/My1kWordsEe/Components/Pages/FavoritesPage.razor b/My1kWordsEe/Components/Pages/FavoritesPage.razor
index 208e332..48dca13 100644
--- a/My1kWordsEe/Components/Pages/FavoritesPage.razor
+++ b/My1kWordsEe/Components/Pages/FavoritesPage.razor
@@ -46,7 +46,7 @@
                 foreach (var wordPair in favorites.Words)
                 {
                     var word = wordPair.Value;
-                    <div class="col col-12 col-sm-6">
+                    <div class="col col-12 col-sm-6 p-1">
                         <Card>
                             <CardBody>
                                 <CardTitle>
diff --git a/My1kWordsEe/Components/Pages/Word.razor b/My1kWordsEe/Components/Pages/Word.razor
index 7890795..fbc1540 100644
--- a/My1kWordsEe/Components/Pages/Word.razor
+++ b/My1kWordsEe/Components/Pages/Word.razor
@@ -59,11 +59,6 @@
             if (favorites.Result.IsSuccess)
             {
                 Favorites = favorites.Result;
-                var favoriteWords = favorites.Result.Value.Words;
-                if (favoriteWords.ContainsKey(EeWord))
-                {
-                    return favoriteWords[EeWord];
-                }
             }
         }
 
@@ -114,6 +109,8 @@
     private string Error => WordMetadata.Value.Error;
 
     private bool IsLoggedIn => User?.Identity?.IsAuthenticated ?? false;
+
+    private bool IsFavorite => IsDataLoadedOk && IsLoggedIn && Favorites.HasValue && Favorites.Value.IsSuccess && Favorites.Value.Value.Words.ContainsKey(EeWord.ToLower());
 }
 
 <script>
@@ -128,16 +125,13 @@
         <h1>
             @EeWord
 
-            @if (IsDataLoadedOk && IsLoggedIn)
+            @if (IsFavorite)
             {
-                @if (Favorites.Value.Value.Words.ContainsKey(EeWord.ToLower()))
-                {
-                    <i role="button" class="bi bi-star-fill" @onclick="RemoveFromFavorites"></i>
-                }
-                else
-                {
-                    <i role="button" class="bi bi-star" @onclick="AddToFavorites"></i>
-                }
+                <i role="button" class="bi bi-star-fill" @onclick="RemoveFromFavorites"></i>
+            }
+            else
+            {
+                <i role="button" class="bi bi-star" @onclick="AddToFavorites"></i>
             }
 
             @if (IsDataLoadedOk && Value.EeAudioUrl != null)
diff --git a/My1kWordsEe/Services/Cqs/AddSampleSentenceCommand.cs b/My1kWordsEe/Services/Cqs/AddSampleSentenceCommand.cs
index 85355ba..9f6b53d 100644
--- a/My1kWordsEe/Services/Cqs/AddSampleSentenceCommand.cs
+++ b/My1kWordsEe/Services/Cqs/AddSampleSentenceCommand.cs
@@ -67,9 +67,9 @@ public async Task<Result<SampleWord>> Invoke(SampleWord word)
                 }).ToArray()
             };
 
-            await this.azureBlobService.SaveWordData(updatedWordData);
-
-            return Result.Success(updatedWordData);
+            return (await this.azureBlobService
+                .SaveWordData(updatedWordData))
+                .Bind(r => Result.Success(updatedWordData));
         }
 
         private Task<Result<Uri>> GenerateImage(Sentence sentence) =>