diff --git a/GanjooRazor/Areas/User/Pages/Editor.cshtml b/GanjooRazor/Areas/User/Pages/Editor.cshtml
index b8024872..2b7d8b85 100644
--- a/GanjooRazor/Areas/User/Pages/Editor.cshtml
+++ b/GanjooRazor/Areas/User/Pages/Editor.cshtml
@@ -241,6 +241,18 @@
         var a = document.getElementById(originalPrefix + id.toString());
         var b = document.getElementById(editedPrefix + id.toString());
         var result = document.getElementById(comparePrefix + id.toString());
+        var changed = a.textContent !== b.textContent;
+
+        var origReveal = document.getElementById(originalPrefix + 'reveal-' + id.toString());
+        var compareReveal = document.getElementById(comparePrefix + 'reveal-' + id.toString());
+        if (origReveal) origReveal.style.display = changed ? '' : 'none';
+        if (compareReveal) compareReveal.style.display = changed ? '' : 'none';
+
+        if (!changed) {
+            result.textContent = a.textContent;
+            return;
+        }
+
         var diff = JsDiff.diffChars(a.textContent, b.textContent);
         var fragment = document.createDocumentFragment();
         for (var i = 0; i < diff.length; i++) {
@@ -778,12 +790,7 @@ else
         <h2 class="up-card__title">ویرایش متن</h2>
 
         <div class="up-field">
-            <label>عنوان فعلی</label>
-            <p id="original-0" class="up-field-static">@Model.PageInformation.Poem.Title</p>
-        </div>
-
-        <div class="up-field">
-            <label for="id-0">عنوان ویراستهٔ من</label>
+            <label for="id-0"><span class="up-field-icon" aria-hidden="true">🏷️</span> عنوان ویراستهٔ من</label>
             @if (Model.MyLastEdit != null && Model.MyLastEdit.Title != null)
             {
                 <div id="id-0" name="id-0" contenteditable="true" class="up-editable">@Model.MyLastEdit.Title</div>
@@ -807,9 +814,18 @@ else
             }
         </div>
 
-        <div class="up-field">
-            <label>تغییرات</label>
-            <p id="compare-0" class="up-field-static">@Model.PageInformation.Poem.Title</p>
+        <div id="original-reveal-0" class="up-reveal" style="display:none">
+            <div class="up-field">
+                <label>عنوان فعلی</label>
+                <p id="original-0" class="up-field-static">@Model.PageInformation.Poem.Title</p>
+            </div>
+        </div>
+
+        <div id="compare-reveal-0" class="up-reveal" style="display:none">
+            <div class="up-field">
+                <label>تغییرات</label>
+                <p id="compare-0" class="up-field-static">@Model.PageInformation.Poem.Title</p>
+            </div>
         </div>
     </div>
 
@@ -822,12 +838,7 @@ else
                 <p class="up-hint">بیت @Model.GetVerseCoupletNumber(verse).ToPersianNumbers() &mdash; ترتیب مصرع یا خط از ابتدا: @verse.VOrder.ToPersianNumbers()</p>
 
                 <div class="up-field">
-                    <label>متن فعلی</label>
-                    <p id="original-@($"{verse.VOrder}")" class="up-field-static">@verse.Text</p>
-                </div>
-
-                <div class="up-field">
-                    <label for="id-@($"{verse.VOrder}")">ویراستهٔ من</label>
+                    <label for="id-@($"{verse.VOrder}")"><span class="up-field-icon" aria-hidden="true">📝</span> ویراستهٔ من</label>
                     @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder && !string.IsNullOrEmpty(v.Text)).Any())
                     {
                         <div id="id-@($"{verse.VOrder}")" name="name-@($"{verse.VOrder}")" contenteditable="true" class="up-editable">@Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).First().Text</div>
@@ -851,88 +862,91 @@ else
                     }
                 </div>
 
-                <div class="up-field">
-                    <label>تغییرات</label>
-                    <p id="compare-@($"{verse.VOrder}")" class="up-field-static">@verse.Text</p>
+                <div id="original-reveal-@($"{verse.VOrder}")" class="up-reveal" style="display:none">
+                    <div class="up-field">
+                        <label>متن فعلی</label>
+                        <p id="original-@($"{verse.VOrder}")" class="up-field-static">@verse.Text</p>
+                    </div>
                 </div>
 
-                <div class="up-field">
-                    <label for="versepostion-@($"{verse.VOrder}")">نوع</label>
-                    <select id="versepostion-@($"{verse.VOrder}")" name="versepostion-@($"{verse.VOrder}")">
-                        @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder && v.VersePosition != null).Any())
+                <div id="compare-reveal-@($"{verse.VOrder}")" class="up-reveal" style="display:none">
+                    <div class="up-field">
+                        <label>تغییرات</label>
+                        <p id="compare-@($"{verse.VOrder}")" class="up-field-static">@verse.Text</p>
+                    </div>
+                </div>
+
+                <div class="up-field-row">
+                    <div class="up-field">
+                        <label for="versepostion-@($"{verse.VOrder}")"><span class="up-field-icon" aria-hidden="true">🔀</span> نوع</label>
+                        <select id="versepostion-@($"{verse.VOrder}")" name="versepostion-@($"{verse.VOrder}")">
+                            @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder && v.VersePosition != null).Any())
+                            {
+                                @foreach (var verseposition in RMuseum.Models.Ganjoor.VersePositionHelper.VersePositions)
+                                    if (verseposition.VersePosition == Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).First().VersePosition)
+                                    {
+                                        <option value="@verseposition.VersePosition" selected>@verseposition.Text</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@verseposition.VersePosition">@verseposition.Text</option>
+                                    }
+                            }
+                            else
+                            {
+                                @foreach (var verseposition in RMuseum.Models.Ganjoor.VersePositionHelper.VersePositions)
+                                    if (verseposition.VersePosition == verse.VersePosition)
+                                    {
+                                        <option value="@verseposition.VersePosition" selected>@verseposition.Text</option>
+                                    }
+                                    else
+                                    {
+                                        <option value="@verseposition.VersePosition">@verseposition.Text</option>
+                                    }
+                            }
+                        </select>
+                        @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).Any())
                         {
-                            @foreach (var verseposition in RMuseum.Models.Ganjoor.VersePositionHelper.VersePositions)
-                                if (verseposition.VersePosition == Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).First().VersePosition)
-                                {
-                                    <option value="@verseposition.VersePosition" selected>@verseposition.Text</option>
-                                }
-                                else
-                                {
-                                    <option value="@verseposition.VersePosition">@verseposition.Text</option>
-                                }
+                            <input type="hidden" id="versepostion-original-@($"{verse.VOrder}")" name="versepostion-original-@($"{verse.VOrder}")" value="@Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).First().VersePosition" />
                         }
                         else
                         {
-                            @foreach (var verseposition in RMuseum.Models.Ganjoor.VersePositionHelper.VersePositions)
-                                if (verseposition.VersePosition == verse.VersePosition)
+                            <input type="hidden" id="versepostion-original-@($"{verse.VOrder}")" name="versepostion-original-@($"{verse.VOrder}")" value="@verse.VersePosition" />
+                        }
+                    </div>
+
+                    <div class="up-field">
+                        <label for="language-@verse.VOrder"><span class="up-field-icon" aria-hidden="true">🌐</span> زبان</label>
+                        <select id="language-@verse.VOrder">
+                            @foreach (var lang in Model.Languages)
+                            {
+                                @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder && v.LanguageId == lang.Id).Any())
                                 {
-                                    <option value="@verseposition.VersePosition" selected>@verseposition.Text</option>
+                                    <option value="@lang.Id" selected>@lang.Name</option>
+                                }
+                                else if (verse.LanguageId == null && lang.Id == 1)
+                                {
+                                    <option value="1" selected>فارسی</option>
+                                }
+                                else if (verse.LanguageId == lang.Id)
+                                {
+                                    <option value="@lang.Id" selected>@lang.Name</option>
                                 }
                                 else
                                 {
-                                    <option value="@verseposition.VersePosition">@verseposition.Text</option>
+                                    <option value="@lang.Id">@lang.Name</option>
                                 }
-                        }
-                    </select>
-                    @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).Any())
-                    {
-                        <input type="hidden" id="versepostion-original-@($"{verse.VOrder}")" name="versepostion-original-@($"{verse.VOrder}")" value="@Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder).First().VersePosition" />
-                    }
-                    else
-                    {
-                        <input type="hidden" id="versepostion-original-@($"{verse.VOrder}")" name="versepostion-original-@($"{verse.VOrder}")" value="@verse.VersePosition" />
-                    }
-                </div>
-
-                <div class="up-field">
-                    <label>زبان فعلی</label>
-                    <p class="up-field-static">
+                            }
+                        </select>
                         @if (verse.LanguageId == null)
                         {
-                            @("فارسی")
                             <span id="language-old-@verse.VOrder" class="hidden-recitation">1</span>
                         }
                         else
                         {
-                            @Model.Languages.Where(l => l.Id == verse.LanguageId).Single().Name
                             <span id="language-old-@verse.VOrder" class="hidden-recitation">@Model.Languages.Where(l => l.Id == verse.LanguageId).Single().Id</span>
                         }
-                    </p>
-                </div>
-
-                <div class="up-field">
-                    <label for="language-@verse.VOrder">زبان</label>
-                    <select id="language-@verse.VOrder">
-                        @foreach (var lang in Model.Languages)
-                        {
-                            @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == verse.VOrder && v.LanguageId == lang.Id).Any())
-                            {
-                                <option value="@lang.Id" selected>@lang.Name</option>
-                            }
-                            else if (verse.LanguageId == null && lang.Id == 1)
-                            {
-                                <option value="1" selected>فارسی</option>
-                            }
-                            else if (verse.LanguageId == lang.Id)
-                            {
-                                <option value="@lang.Id" selected>@lang.Name</option>
-                            }
-                            else
-                            {
-                                <option value="@lang.Id">@lang.Name</option>
-                            }
-                        }
-                    </select>
+                    </div>
                 </div>
 
                 <div class="up-check-row">
@@ -978,7 +992,7 @@ else
             </div>
 
             <div class="up-field">
-                <label for="select-search">جستجوی وزن</label>
+                <label for="select-search"><span class="up-field-icon" aria-hidden="true">🎵</span> جستجوی وزن</label>
                 <input type="text" id="select-search" value="" oninput="doSearchInRhythmsCombo('select-search', 'rhythm-new')" list="inputRhythms" autocomplete="off" />
                 <datalist id="inputRhythms">
                     @if (Model.RhythmsByVerseCount != null)
@@ -990,7 +1004,7 @@ else
             </div>
 
             <div class="up-field">
-                <label for="rhythm-new">وزن ویراستهٔ من</label>
+                <label for="rhythm-new"><span class="up-field-icon" aria-hidden="true">🎵</span> وزن ویراستهٔ من</label>
                 <select id="rhythm-new" name="rhythm-new">
                     @foreach (var rhythm in Model.RhythmsAlphabetically)
                     {
@@ -1051,7 +1065,7 @@ else
             </div>
 
             <div class="up-field">
-                <label for="rhyme-letters">حروف قافیهٔ ویراستهٔ من (بدون فاصله و حرکات)</label>
+                <label for="rhyme-letters"><span class="up-field-icon" aria-hidden="true">🔤</span> حروف قافیهٔ ویراستهٔ من (بدون فاصله و حرکات)</label>
                 <div class="up-btn-group up-mt-0">
                     @if (Model.MyLastEdit != null && !string.IsNullOrEmpty(Model.MyLastEdit.RhymeLetters))
                     {
@@ -1080,7 +1094,7 @@ else
                 <p id="rhythm-old2" class="up-field-static">@(Model.GanjoorMetre2 == null ? "" : Model.GanjoorMetre2.Rhythm)</p>
             </div>
             <div id="secondr4" class="up-field" style="display:none">
-                <label for="select-search2">جستجوی وزن (دوم)</label>
+                <label for="select-search2"><span class="up-field-icon" aria-hidden="true">🎵</span> جستجوی وزن (دوم)</label>
                 <input type="text" id="select-search2" value="" oninput="doSearchInRhythmsCombo('select-search2', 'rhythm-new2')" list="inputRhythms2" autocomplete="off" />
                 <datalist id="inputRhythms2">
                     @if (Model.RhythmsByVerseCount != null)
@@ -1091,7 +1105,7 @@ else
                 </datalist>
             </div>
             <div id="secondr5" class="up-field" style="display:none">
-                <label for="rhythm-new2">وزن (دوم) انتخاب شده</label>
+                <label for="rhythm-new2"><span class="up-field-icon" aria-hidden="true">🎵</span> وزن (دوم) انتخاب شده</label>
                 <select id="rhythm-new2" name="rhythm-new2">
                     @foreach (var rhythm in Model.RhythmsAlphabetically)
                     {
@@ -1127,7 +1141,7 @@ else
             </div>
 
             <div class="up-field">
-                <label for="poemformat">قالب شعری</label>
+                <label for="poemformat"><span class="up-field-icon" aria-hidden="true">📐</span> قالب شعری</label>
                 <select id="poemformat">
                     @foreach (var poemFormat in System.Enum.GetValues(typeof(RMuseum.Models.Ganjoor.GanjoorPoemFormat)))
                     {
@@ -1153,7 +1167,7 @@ else
 
     <div class="up-card">
         <div class="up-field">
-            <label for="note">توضیح این ویرایش</label>
+            <label for="note"><span class="up-field-icon" aria-hidden="true">🗒️</span> توضیح این ویرایش</label>
             @if (Model.MyLastEdit != null && !string.IsNullOrEmpty(Model.MyLastEdit.Note))
             {
                 <input type="text" id="note" name="note" value="@Model.MyLastEdit.Note" />
@@ -1179,16 +1193,7 @@ else
         <p class="up-hint">اگر متن یا شعر یک مفهوم و خلاصهٔ کلی ندارد (مثل خیلی از غزلیات حافظ) برای آن متن کلی وارد نکنید.</p>
 
         <div class="up-field">
-            <label>خلاصهٔ فعلی</label>
-            <p id="originalsummary-0" class="up-field-static">@Model.PageInformation.Poem.PoemSummary</p>
-            @if (string.IsNullOrEmpty(Model.PageInformation.Poem.PoemSummary))
-            {
-                <p class="up-hint">هنوز متنی برای خلاصهٔ کلی نوشته نشده است.</p>
-            }
-        </div>
-
-        <div class="up-field">
-            <label for="summary-0">خلاصهٔ ویراستهٔ من (به زبان غیرمحاوره‌ای و همه‌کس فهم)</label>
+            <label for="summary-0"><span class="up-field-icon" aria-hidden="true">💬</span> خلاصهٔ ویراستهٔ من (به زبان غیرمحاوره‌ای و همه‌کس فهم)</label>
             @if (Model.MyLastEdit != null && Model.MyLastEdit.PoemSummary != null)
             {
                 <div id="summary-0" name="summary-0" contenteditable="true" class="up-editable">@Model.MyLastEdit.PoemSummary</div>
@@ -1210,11 +1215,24 @@ else
                     }, false);
                 </script>
             }
+            @if (string.IsNullOrEmpty(Model.PageInformation.Poem.PoemSummary))
+            {
+                <p class="up-hint">هنوز متنی برای خلاصهٔ کلی نوشته نشده است.</p>
+            }
         </div>
 
-        <div class="up-field">
-            <label>تغییرات</label>
-            <p id="comparesummary-0" class="up-field-static">@Model.PageInformation.Poem.PoemSummary</p>
+        <div id="originalsummary-reveal-0" class="up-reveal" style="display:none">
+            <div class="up-field">
+                <label>خلاصهٔ فعلی</label>
+                <p id="originalsummary-0" class="up-field-static">@Model.PageInformation.Poem.PoemSummary</p>
+            </div>
+        </div>
+
+        <div id="comparesummary-reveal-0" class="up-reveal" style="display:none">
+            <div class="up-field">
+                <label>تغییرات</label>
+                <p id="comparesummary-0" class="up-field-static">@Model.PageInformation.Poem.PoemSummary</p>
+            </div>
         </div>
 
         <a role="button" href="#savecorrections" class="up-btn up-btn--sm up-btn--ghost">لغزش به دکمهٔ ذخیره</a>
@@ -1264,16 +1282,7 @@ else
                     </div>
 
                     <div class="up-field">
-                        <label>معنای فعلی</label>
-                        <p id="originalsummary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" class="up-field-static">@Model.PageInformation.Poem.Verses[verseIndex].CoupletSummary</p>
-                        @if (string.IsNullOrEmpty(Model.PageInformation.Poem.Verses[verseIndex].CoupletSummary))
-                        {
-                            <p class="up-hint">هنوز متنی برای معنی نوشته نشده است.</p>
-                        }
-                    </div>
-
-                    <div class="up-field">
-                        <label for="summary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")">معنای ویراستهٔ من (به زبان غیرمحاوره‌ای و همه‌کس فهم)</label>
+                        <label for="summary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")"><span class="up-field-icon" aria-hidden="true">💬</span> معنای ویراستهٔ من (به زبان غیرمحاوره‌ای و همه‌کس فهم)</label>
                         @if (Model.MyLastEdit != null && Model.MyLastEdit.VerseOrderText != null && Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == Model.PageInformation.Poem.Verses[verseIndex].VOrder && !string.IsNullOrEmpty(v.CoupletSummary)).Any())
                         {
                             <div id="summary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" name="summary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" contenteditable="true" class="up-editable">@Model.MyLastEdit.VerseOrderText.Where(v => v.VORder == Model.PageInformation.Poem.Verses[verseIndex].VOrder).First().CoupletSummary</div>
@@ -1295,11 +1304,24 @@ else
                                 }, false);
                             </script>
                         }
+                        @if (string.IsNullOrEmpty(Model.PageInformation.Poem.Verses[verseIndex].CoupletSummary))
+                        {
+                            <p class="up-hint">هنوز متنی برای معنی نوشته نشده است.</p>
+                        }
                     </div>
 
-                    <div class="up-field">
-                        <label>تغییرات</label>
-                        <p id="comparesummary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" class="up-field-static">@Model.PageInformation.Poem.Verses[verseIndex].CoupletSummary</p>
+                    <div id="originalsummary-reveal-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" class="up-reveal" style="display:none">
+                        <div class="up-field">
+                            <label>معنای فعلی</label>
+                            <p id="originalsummary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" class="up-field-static">@Model.PageInformation.Poem.Verses[verseIndex].CoupletSummary</p>
+                        </div>
+                    </div>
+
+                    <div id="comparesummary-reveal-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" class="up-reveal" style="display:none">
+                        <div class="up-field">
+                            <label>تغییرات</label>
+                            <p id="comparesummary-@($"{Model.PageInformation.Poem.Verses[verseIndex].VOrder}")" class="up-field-static">@Model.PageInformation.Poem.Verses[verseIndex].CoupletSummary</p>
+                        </div>
                     </div>
 
                     <a role="button" href="#savecorrections" class="up-btn up-btn--sm up-btn--ghost">لغزش به دکمهٔ ذخیره</a>
diff --git a/GanjooRazor/Areas/User/Pages/Section.cshtml b/GanjooRazor/Areas/User/Pages/Section.cshtml
index e9144109..01579b79 100644
--- a/GanjooRazor/Areas/User/Pages/Section.cshtml
+++ b/GanjooRazor/Areas/User/Pages/Section.cshtml
@@ -160,7 +160,7 @@ else
         <h2 class="up-card__title">وزن</h2>
 
         <div class="up-field">
-            <label>وزن فعلی</label>
+            <label><span class="up-field-icon" aria-hidden="true">🎵</span> وزن فعلی</label>
             <p id="rhythm-old" class="up-field-static">@(Model.PoemSection.GanjoorMetre == null ? "" : Model.PoemSection.GanjoorMetre.Rhythm)</p>
         </div>
 
@@ -169,7 +169,7 @@ else
         </div>
 
         <div class="up-field">
-            <label for="select-search">جستجوی وزن</label>
+            <label for="select-search"><span class="up-field-icon" aria-hidden="true">🎵</span> جستجوی وزن</label>
             <input type="text" id="select-search" value="" oninput="doSearchInRhythmsCombo('select-search', 'rhythm-new')" list="inputRhythms" autocomplete="off" />
             <datalist id="inputRhythms">
                 @if (Model.RhythmsByVerseCount != null)
@@ -181,7 +181,7 @@ else
         </div>
 
         <div class="up-field">
-            <label for="rhythm-new">وزن ویراستهٔ من</label>
+            <label for="rhythm-new"><span class="up-field-icon" aria-hidden="true">🎵</span> وزن ویراستهٔ من</label>
             <select id="rhythm-new" name="rhythm-new">
                 @foreach (var rhythm in Model.RhythmsAlphabetically)
                 {
@@ -236,12 +236,12 @@ else
         <h2 class="up-card__title">قافیه</h2>
 
         <div class="up-field">
-            <label>حروف قافیهٔ فعلی</label>
+            <label><span class="up-field-icon" aria-hidden="true">🔤</span> حروف قافیهٔ فعلی</label>
             <p id="rhyme-letters-old" class="up-field-static">@Model.PoemSection.RhymeLetters</p>
         </div>
 
         <div class="up-field">
-            <label for="rhyme-letters">حروف قافیهٔ پیشنهادی من (بدون فاصله و حرکات)</label>
+            <label for="rhyme-letters"><span class="up-field-icon" aria-hidden="true">🔤</span> حروف قافیهٔ پیشنهادی من (بدون فاصله و حرکات)</label>
             <div class="up-btn-group up-mt-0">
                 @if (Model.MyLastEdit != null && !string.IsNullOrEmpty(Model.MyLastEdit.RhymeLetters))
                 {
@@ -314,7 +314,7 @@ else
         <h2 class="up-card__title">زبان</h2>
 
         <div class="up-field">
-            <label>زبان فعلی</label>
+            <label><span class="up-field-icon" aria-hidden="true">🌐</span> زبان فعلی</label>
             <p class="up-field-static">
                 @RMuseum.Models.Ganjoor.GanjoorLanguage.LanguageNameFromCode(Model.Languages, Model.PoemSection.Language)
                 <span id="language-old" class="hidden-recitation">@Model.PoemSection.Language</span>
@@ -322,7 +322,7 @@ else
         </div>
 
         <div class="up-field">
-            <label for="language">زبان</label>
+            <label for="language"><span class="up-field-icon" aria-hidden="true">🌐</span> زبان</label>
             <select id="language">
                 @foreach (var lang in Model.Languages)
                 {
@@ -360,7 +360,7 @@ else
         </div>
 
         <div class="up-field">
-            <label for="poemformat">قالب شعری</label>
+            <label for="poemformat"><span class="up-field-icon" aria-hidden="true">📐</span> قالب شعری</label>
             <select id="poemformat">
                 @foreach (var poemFormat in System.Enum.GetValues(typeof(RMuseum.Models.Ganjoor.GanjoorPoemFormat)))
                 {
@@ -384,7 +384,7 @@ else
 
     <div class="up-card">
         <div class="up-field">
-            <label for="note">توضیح این ویرایش</label>
+            <label for="note"><span class="up-field-icon" aria-hidden="true">🗒️</span> توضیح این ویرایش</label>
             @if (Model.MyLastEdit != null && !string.IsNullOrEmpty(Model.MyLastEdit.Note))
             {
                 <input type="text" id="note" name="note" value="@Model.MyLastEdit.Note" />
diff --git a/GanjooRazor/wwwroot/css/user-panel.css b/GanjooRazor/wwwroot/css/user-panel.css
index 8f4d304b..2f6e8275 100644
--- a/GanjooRazor/wwwroot/css/user-panel.css
+++ b/GanjooRazor/wwwroot/css/user-panel.css
@@ -494,7 +494,7 @@ body.up-modal-open {
 }
 
 .up-verse-row {
-    padding: 6px 0;
+    padding: 8px 0;
     border-bottom: 1px solid var(--up-border);
     line-height: 1.9;
 }
@@ -503,6 +503,11 @@ body.up-modal-open {
     border-bottom: none;
 }
 
+.up-verse-row .up-field {
+    line-height: 1.5;
+    margin-bottom: 6px;
+}
+
 /* ---------- small utilities ---------- */
 
 .up-mt-0 { margin-top: 0; }
@@ -520,14 +525,35 @@ body.up-modal-open {
 .up-field {
     display: flex;
     flex-direction: column;
-    gap: var(--up-space-1);
+    gap: 2px;
 }
 
 .up-field > label {
-    font-size: 0.85rem;
+    font-size: 0.72rem;
+    line-height: 1.3;
     color: var(--up-text-muted);
+    display: flex;
+    align-items: center;
+    gap: 4px;
 }
 
+.up-field > label .up-field-icon {
+    font-size: 0.85em;
+    opacity: 0.8;
+}
+
+.up-field-row {
+    display: flex;
+    gap: var(--up-space-3);
+    flex-wrap: wrap;
+}
+
+.up-field-row > .up-field {
+    flex: 1 1 160px;
+    min-width: 140px;
+}
+
+
 .up-field input[type="text"],
 .up-field input[type="password"],
 .up-field input[type="email"],
@@ -569,9 +595,10 @@ body.up-modal-open {
 
 .up-editable {
     display: block;
+    position: relative;
     width: 100%;
     min-height: 1.6em;
-    padding: 9px 12px;
+    padding: 9px 34px 9px 12px;
     border: 1px solid var(--up-primary);
     border-radius: var(--up-radius-sm);
     background: var(--up-surface-alt);
@@ -582,6 +609,16 @@ body.up-modal-open {
     transition: box-shadow .15s ease, border-color .15s ease, background .15s ease;
 }
 
+.up-editable::before {
+    content: "\270E";
+    position: absolute;
+    top: 8px;
+    left: 10px;
+    font-size: 0.85em;
+    opacity: 0.55;
+    pointer-events: none;
+}
+
 .up-editable:hover {
     border-color: var(--up-primary);
     box-shadow: 0 0 0 2px rgba(51, 0, 0, 0.08);
@@ -626,11 +663,22 @@ body.up-modal-open {
 }
 
 .up-field-static {
-    padding: 9px 0;
+    padding: 2px 0;
     color: var(--up-text-muted);
     font-size: 0.9rem;
 }
 
+/* ---------- progressive disclosure ----------
+   Hidden by default (inline style="display:none" set in markup); JS reveals
+   it only once the editable content actually diverges from the original,
+   so read-only/diff information doesn't compete for attention until it's
+   relevant. */
+.up-reveal {
+    margin-top: var(--up-space-2);
+    padding-top: var(--up-space-2);
+    border-top: 1px dashed var(--up-border);
+}
+
 .up-hint {
     font-size: 0.78rem;
     color: var(--up-text-muted);