diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml
index ecb4e0f5..8fa79ae1 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml
@@ -6,13 +6,16 @@
 @model EShopOnAbp.PublicWeb.Components.UserOrders.UserOrderWidgetViewComponent.UserOrderViewModel
 @inject IStringLocalizer<EShopOnAbpResource> L
 @inject IOptions<AbpRemoteServiceOptions> options
+
 @if (Model.ServiceError)
 {
     <div>SERVICE ERROR</div>
 }
+
 <abp-row class="m-2 p-2" style="text-align: center">
     <span class="order-title">@L["UserOrders:TotalOrderCount"] <strong>@Model.UserOrders.Count</strong></span>
 </abp-row>
+
 @foreach (var order in Model.UserOrders)
 {
     var orderTotalString = order.Items.Sum(q => q.UnitPrice * q.Units).ToString("C", new CultureInfo("en-US"));
@@ -56,7 +59,7 @@
                                     <img class="img-size" src="@imageUrl" />
                                 }
                             </abp-column>
-                            <abp-column size-lg="_4">
+                            <abp-column size-lg="_4" size-md="_4" size-sm="_4">
                                 <div><strong>@item.ProductName</strong></div>
                                 <div>@L["UserOrders:ProductReturnDate"] @order.OrderDate.AddMonths(1).ToString("dd MMMM yyyy")</div>
                                 <div class="mt-3">
@@ -65,10 +68,16 @@
                             </abp-column>
                             <abp-column offset="_3" size="_2">
                                 <abp-row class="pb-3">
-                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">@L["UserOrders:ReturnProducts"]</abp-button>
+                                    <span>
+                                        <a class="btn btn-light shadow" href="/ProductDetail/@item.ProductId.ToString()">
+                                            @L["UserOrders:ReturnProducts"]
+                                        </a>
+                                    </span>
                                 </abp-row>
                                 <abp-row>
-                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">@L["UserOrders:AddReview"]</abp-button>
+                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">
+                                        @L["UserOrders:AddReview"]
+                                    </abp-button>
                                 </abp-row>
                             </abp-column>
                         </abp-row>