diff --git a/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css b/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css
index fb9fdb6..1dabd4d 100644
--- a/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css
+++ b/src/EventHub.Web.Theme/wwwroot/themes/eventhub/style.css
@@ -563,8 +563,8 @@ nav.breadcrumb-container .breadcrumb a,nav.breadcrumb-container .breadcrumb li{
 }
 .org-avatar {
     margin: 5px 10px 5px 0;
-    width: 60px;
-    height: 60px;
+    width: 40px;
+    height: 40px;
 }
 .detail-head {
     font-weight: normal;
diff --git a/src/EventHub.Web/Pages/Events/Components/AttendeesArea/Default.cshtml b/src/EventHub.Web/Pages/Events/Components/AttendeesArea/Default.cshtml
index 16c3b89..e6f7a58 100644
--- a/src/EventHub.Web/Pages/Events/Components/AttendeesArea/Default.cshtml
+++ b/src/EventHub.Web/Pages/Events/Components/AttendeesArea/Default.cshtml
@@ -1,8 +1,15 @@
 @model EventHub.Web.Pages.Events.Components.AttendeesArea.AttendeesAreaViewComponent.AttendeesAreaViewComponentModel
 <h5 class="detail-head mt-5 font-weight-bold" data-event-id="@Model.EventId">Attendees (@Model.TotalCount)</h5> 
-<div>
-    @foreach (var attendee in Model.Attendees)
-    {
-        <img gravatar-email="@attendee.Email" default-image="Wavatar" gravatar-size="60" class="org-avatar rounded-circle"/>
-    }
-</div>
\ No newline at end of file
+@if (Model.TotalCount > 0)
+{
+    <div>
+        @foreach (var attendee in Model.Attendees)
+        {
+            <img gravatar-email="@attendee.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar rounded-circle"/>
+        }
+    </div>
+}
+else
+{
+    <p>There is no attendee</p>
+}
diff --git a/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml b/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml
index 09720e1..76c1ba9 100644
--- a/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml
+++ b/src/EventHub.Web/Pages/Events/Components/EventsArea/Default.cshtml
@@ -29,4 +29,8 @@
             </div>
         </div>
     }
+}
+else
+{
+    <p>There is no Event</p>
 }
\ No newline at end of file
diff --git a/src/EventHub.Web/Pages/Events/Detail.cshtml b/src/EventHub.Web/Pages/Events/Detail.cshtml
index 118dda3..417a473 100644
--- a/src/EventHub.Web/Pages/Events/Detail.cshtml
+++ b/src/EventHub.Web/Pages/Events/Detail.cshtml
@@ -34,7 +34,7 @@
 
                 <h5 class="detail-head mt-4">Owner</h5>
                 <div>
-                    <img gravatar-email="@Model.Event.OwnerEmail" default-image="Wavatar" gravatar-size="60" class="org-avatar avatar rounded-circle"/>
+                    <img gravatar-email="@Model.Event.OwnerEmail" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle"/>
                 </div>
                 @if (Model.IsEventOwner)
                 {
diff --git a/src/EventHub.Web/Pages/Organizations/Components/MembersArea/Default.cshtml b/src/EventHub.Web/Pages/Organizations/Components/MembersArea/Default.cshtml
index 5ebf29c..78c9570 100644
--- a/src/EventHub.Web/Pages/Organizations/Components/MembersArea/Default.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Components/MembersArea/Default.cshtml
@@ -10,9 +10,17 @@
         <span>(@Model.TotalCount)</span>
     }
 </h5>
-<div id="MemberList-@Model.GetHashCode()" class="row">
-    <partial name="~/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml" model="@Model.Members"/>
-</div>
+@if (Model.TotalCount > 0)
+{
+    <div id="MemberList-@Model.GetHashCode()" class="row">
+        <partial name="~/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml" model="@Model.Members"/>
+    </div>
+}
+else
+{
+    <p>There is no member</p>
+}
+
 @if (Model.IsPagination && Model.TotalCount > Model.MaxResultCount && Model.TotalCount > Model.Members.Count)
 {
     <div id="load-more-section-@Model.GetHashCode()">
diff --git a/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml b/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
index eb06895..65805a5 100644
--- a/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Components/MembersArea/_memberListSection.cshtml
@@ -4,7 +4,7 @@
 {
     <div>
         <div>
-            <img gravatar-email="@member.Email" default-image="Wavatar" gravatar-size="60" class="org-avatar avatar rounded-circle"/>
+            <img gravatar-email="@member.Email" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle"/>
             <span class="member-name" style="display: none">
                 @if (!string.IsNullOrWhiteSpace(member.Name) && !string.IsNullOrWhiteSpace(member.Surname))
                 {
@@ -12,9 +12,7 @@
                 }
                 else
                 {
-                    {
-                        @member.UserName
-                    }
+                    {@member.UserName}
                 }
             </span>
         </div>
diff --git a/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/Default.cshtml b/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/Default.cshtml
index 38184bd..ea18876 100644
--- a/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/Default.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/Default.cshtml
@@ -23,4 +23,8 @@
             </div>
         </div>
     }
+}
+else
+{
+    <p>There is no organization</p>
 }
\ No newline at end of file
diff --git a/src/EventHub.Web/Pages/Organizations/Profile.cshtml b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
index 9228369..dfa708d 100644
--- a/src/EventHub.Web/Pages/Organizations/Profile.cshtml
+++ b/src/EventHub.Web/Pages/Organizations/Profile.cshtml
@@ -55,7 +55,7 @@
                             <div class="col-md-5">
                                 <h5 class="detail-head mt-3 font-weight-bold">Owners</h5>
                                 <div>
-                                    <img gravatar-email="@Model.Organization.OwnerEmail" default-image="Wavatar" gravatar-size="60" class="org-avatar avatar rounded-circle" data-toggle="tooltip" title="" data-original-title="@Model.Organization.OwnerUserName"/>
+                                    <img gravatar-email="@Model.Organization.OwnerEmail" default-image="Wavatar" gravatar-size="40" class="org-avatar avatar rounded-circle" data-toggle="tooltip" title="" data-original-title="@Model.Organization.OwnerUserName"/>
                                 </div>
 
                                 @if (Model.IsOrganizationOwner)