diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php
index ea119d077..aaba0cc4d 100644
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@@ -167,7 +167,7 @@ XML;
 
     public function userInbox(Request $request, $username)
     {
-        // todo
+        return;
     }
 
     public function userFollowing(Request $request, $username)
@@ -175,7 +175,10 @@ XML;
         if (config('pixelfed.activitypub_enabled') == false) {
             abort(403);
         }
-        $profile = Profile::whereNull('remote_url')->whereUsername($username)->firstOrFail();
+        $profile = Profile::whereNull('remote_url')
+            ->whereUsername($username)
+            ->whereIsPrivate(false)
+            ->firstOrFail();
         $obj = [
             '@context' => 'https://www.w3.org/ns/activitystreams',
             'id'       => $request->getUri(),
@@ -193,7 +196,10 @@ XML;
         if (config('pixelfed.activitypub_enabled') == false) {
             abort(403);
         }
-        $profile = Profile::whereNull('remote_url')->whereUsername($username)->firstOrFail();
+        $profile = Profile::whereNull('remote_url')
+            ->whereUsername($username)
+            ->whereIsPrivate(false)
+            ->firstOrFail();
         $obj = [
             '@context' => 'https://www.w3.org/ns/activitystreams',
             'id'       => $request->getUri(),
diff --git a/resources/assets/js/components/PostComments.vue b/resources/assets/js/components/PostComments.vue
index 5ac700c1e..cc57ad699 100644
--- a/resources/assets/js/components/PostComments.vue
+++ b/resources/assets/js/components/PostComments.vue
@@ -3,7 +3,6 @@
   font-size: 14px;
  }
  .comment-text {
-  word-break: break-all;
  }
  .comment-text p {
   display: inline;
@@ -33,7 +32,7 @@
             </template>
             <b-dropdown-item class="font-weight-bold" v-on:click="reply(comment)">Reply</b-dropdown-item>
             <b-dropdown-item class="font-weight-bold" :href="comment.url">Permalink</b-dropdown-item>
-            <b-dropdown-item class="font-weight-bold" v-on:click="embed(comment)">Embed</b-dropdown-item>
+            <!-- <b-dropdown-item class="font-weight-bold" v-on:click="embed(comment)">Embed</b-dropdown-item> -->
             <b-dropdown-item class="font-weight-bold" :href="comment.account.url">Profile</b-dropdown-item>
             <b-dropdown-divider></b-dropdown-divider>
             <b-dropdown-item class="font-weight-bold" :href="'/i/report?type=post&id='+comment.id">Report</b-dropdown-item>
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 450414f36..818691161 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -41,13 +41,13 @@
 									<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
 									<p class="font-weight-light">(click to show)</p>
 								</summary>
-								<a class="max-hide-overflow" :href="status.url">
+								<a class="max-hide-overflow" :href="status.url" :class="status.media_attachments[0].filter_class">
 									<img class="card-img-top" :src="status.media_attachments[0].url">
 								</a>
 							</details>
 						</div>
 						<div v-else>
-							<div>
+							<div :class="status.media_attachments[0].filter_class">
 								<img class="card-img-top" :src="status.media_attachments[0].url">
 							</div>
 						</div>
@@ -74,7 +74,7 @@
 						</div>
 					</div>
 
-					<div v-else-if="status.pf_type === 'photo:album'">
+					<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
 						<div v-if="status.sensitive == true">
 							<details class="details-animated">
 								<summary>
@@ -251,7 +251,7 @@
 					<div class="card-body contents d-none">
 						<div class="media d-flex align-items-center">
 							<a :href="profile.url">
-								<img class="mr-3 rounded-circle box-shadow" :src="profile.avatar || '/storage/avatars/default.png'" alt="avatar" width="64px">
+								<img class="mr-3 rounded-circle box-shadow" :src="profile.avatar || '/storage/avatars/default.png'" alt="avatar" width="64px" height="64px">
 							</a>
 							<div class="media-body">
 								<p class="mb-0 px-0 font-weight-bold"><a :href="profile.url" class="text-dark">&commat;{{profile.username}}</a></p>
@@ -291,7 +291,7 @@
 					</div>
 					<div class="card-body pt-2 contents" style="max-height: 300px; overflow-y: scroll;">
 						<div class="media mb-3 align-items-center" v-for="(n, index) in notifications">
-							<img class="mr-2 rounded-circle img-thumbnail" :src="n.account.avatar" alt="" width="32px">
+							<img class="mr-2 rounded-circle img-thumbnail" :src="n.account.avatar" alt="" width="32px" height="32px">
 							<div class="media-body font-weight-light small">
 								<div v-if="n.type == 'favourite'">
 									<p class="my-0">