diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 147d958429a1f3c9c56949e42426b102ec91661e..179db033d0312611e005b99f759ed62ef29516fc 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -118,8 +118,7 @@ class ProfileController extends Controller
 					'list' => $settings->show_profile_followers
 				]
 			];
-			$ui = $request->has('ui') && $request->input('ui') == 'memory' ? 'profile.memory' : 'profile.show';
-			return view($ui, compact('profile', 'settings'));
+			return view('profile.show', compact('profile', 'settings'));
 		}
 	}
 
@@ -210,7 +209,7 @@ class ProfileController extends Controller
 			->whereProfileId($pid)
 			->whereVisibility('public')
 			->whereType('photo')
-			->latest()
+			->orderByDesc('id')
 			->take(10)
 			->get()
 			->map(function($status) {
@@ -224,10 +223,14 @@ class ProfileController extends Controller
 			})
 			->values();
 		$permalink = config('app.url') . "/users/{$profile['username']}.atom";
+		$headers = ['Content-Type' => 'application/atom+xml'];
 
+		if($items && $items->count()) {
+			$headers['Last-Modified'] = now()->parse($items->first()['created_at'])->toRfc7231String();
+		}
 		return response()
 			->view('atom.user', compact('profile', 'items', 'permalink'))
-			->header('Content-Type', 'application/atom+xml');
+			->withHeaders($headers);
 	}
 
 	public function meRedirect()