diff --git a/app/views/members/show.html.haml b/app/views/members/show.html.haml
index 9eb83ab..b3699bb 100644
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -32,16 +32,18 @@
 
 - @member.stories.each do |story|
   =render_story( story )
-  .flex.justify-around
-    = link_to edit_story_path(story) do
-      %button.bg-cyan-200.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400
-        Edit Story
+  - if current_member == @member
+    .flex.justify-around
+      = link_to edit_story_path(story) do
+        %button.bg-cyan-200.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400
+          Edit Story
 
-.mx-20.grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-3.gap-8.md:gap-12.lg:gap-16
+.mx-20.grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-3.xl:grid-cols-4.gap-8.md:gap-12.lg:gap-16
   - @member.pictures.each do |picture|
     %div
       = render picture , picture: picture
-      .flex.justify-around
-        = link_to edit_picture_path(picture) do
-          %button.bg-cyan-200.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400
-            Edit Picture
+      - if current_member == @member
+        .flex.justify-around
+          = link_to edit_picture_path(picture) do
+            %button.bg-cyan-200.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400
+              Edit Picture
diff --git a/app/views/pictures/_picture.haml b/app/views/pictures/_picture.haml
index c9acdde..770e806 100644
--- a/app/views/pictures/_picture.haml
+++ b/app/views/pictures/_picture.haml
@@ -1,6 +1,6 @@
 .group.relative.overflow-hidden
   .flex.justify-between
-    .ml-2=picture.member.name
+    .ml-2= link_to picture.member.name , member_path(picture.member) , class: :underline
     .mr-2
       = distance_of_time_in_words_to_now picture.happened
       ago
diff --git a/app/views/pictures/index.html.haml b/app/views/pictures/index.html.haml
index 135d058..1dd26e5 100644
--- a/app/views/pictures/index.html.haml
+++ b/app/views/pictures/index.html.haml
@@ -5,7 +5,7 @@
   .border-r-4.mx-4
   = sort_link(@q, :created_at , class: 'flex flex-nowrap text-md')
 
-.mx-20.grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-3.gap-8.md:gap-12.lg:gap-16
+.mx-20.grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-3.xl:grid-cols-4.gap-8.md:gap-12.lg:gap-16
   - @pictures.each do |picture|
     = render picture , picture: picture