diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php
index 61b52fe2..f6ddff91 100644
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@@ -306,4 +306,18 @@ class InternalApiController extends Controller
         Cache::forget('profile:status_count:'.$profile->id);
         return $status->url();
     }
+
+    public function bookmarks(Request $request)
+    {
+        $statuses = Auth::user()->profile
+            ->bookmarks()
+            ->withCount(['likes','comments'])
+            ->orderBy('created_at', 'desc')
+            ->simplePaginate(10);
+
+        $resource = new Fractal\Resource\Collection($statuses, new StatusTransformer());
+        $res = $this->fractal->createData($resource)->toArray();
+
+        return response()->json($res);
+    }
 }
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 7050bb6d..d5db00b1 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -240,23 +240,4 @@ class ProfileController extends Controller
         }
         return view('profile.following', compact('user', 'profile', 'following', 'owner', 'is_following', 'is_admin', 'settings'));
     }
-
-    public function savedBookmarks(Request $request, $username)
-    {
-        if (Auth::check() === false || $username !== Auth::user()->username) {
-            abort(403);
-        }
-        $user = $profile = Auth::user()->profile;
-        if($profile->status != null) {
-            return $this->accountCheck($profile);
-        }
-        $settings = User::whereUsername($username)->firstOrFail()->settings;
-        $owner = true;
-        $following = false;
-        $timeline = $user->bookmarks()->withCount(['likes','comments'])->orderBy('created_at', 'desc')->simplePaginate(10);
-        $is_following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : false;
-        $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
-        return view('profile.bookmarks', compact('user', 'profile', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin'));
-    }
-
 }
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 769c9073..c78bad9e 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -192,8 +192,14 @@ class SettingsController extends Controller
         $patreon = Str::startsWith($request->input('patreon'), 'https://') ? 
             substr($request->input('patreon'), 8) : 
             $request->input('patreon');
-        $liberapay = Str::startsWith($request->input('liberapay'), 'https://') ? substr($request->input('liberapay'), 8) : $request->input('liberapay');
-        $opencollective = Str::startsWith($request->input('opencollective'), 'https://') ? substr($request->input('opencollective'), 8) : $request->input('opencollective');
+
+        $liberapay = Str::startsWith($request->input('liberapay'), 'https://') ? 
+            substr($request->input('liberapay'), 8) : 
+            $request->input('liberapay');
+            
+        $opencollective = Str::startsWith($request->input('opencollective'), 'https://') ? 
+            substr($request->input('opencollective'), 8) : 
+            $request->input('opencollective');
 
         $patreon = Str::startsWith($patreon, 'patreon.com/') ? e($patreon) : null;
         $liberapay = Str::startsWith($liberapay, 'liberapay.com/') ? e($liberapay) : null;
diff --git a/public/js/profile.js b/public/js/profile.js
index 9661c7e5..df0f2850 100644
Binary files a/public/js/profile.js and b/public/js/profile.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 21dbaa09..565cc777 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue
index b3e53504..e25c9fa0 100644
--- a/resources/assets/js/components/Profile.vue
+++ b/resources/assets/js/components/Profile.vue
@@ -1,524 +1,526 @@
 <template>
-	<div class="w-100 h-100">
-		<div v-if="relationship && relationship.blocking && warning" class="bg-white pt-3 border-bottom">
-			<div class="container">
-				<p class="text-center font-weight-bold">You are blocking this account</p>
-				<p class="text-center font-weight-bold">Click <a href="#" class="cursor-pointer" @click.prevent="warning = false;">here</a> to view profile</p>
-			</div>
+<div class="w-100 h-100">
+	<div v-if="relationship && relationship.blocking && warning" class="bg-white pt-3 border-bottom">
+		<div class="container">
+			<p class="text-center font-weight-bold">You are blocking this account</p>
+			<p class="text-center font-weight-bold">Click <a href="#" class="cursor-pointer" @click.prevent="warning = false;">here</a> to view profile</p>
 		</div>
-		<div v-if="loading" style="height: 80vh;" class="d-flex justify-content-center align-items-center">
-			<img src="/img/pixelfed-icon-grey.svg" class="">
-		</div>
-		<div v-if="!loading && !warning">
-			<div v-if="profileLayout == 'metro'">
-				<div class="bg-white py-5 border-bottom">
-					<div class="container">
-						<div class="row">
-							<div class="col-12 col-md-4 d-flex">
-								<div class="profile-avatar mx-md-auto">
-									<div class="d-block d-md-none">
-										<div class="row">
-											<div class="col-5">
-												<img class="rounded-circle box-shadow mr-2" :src="profile.avatar" width="77px" height="77px">
-												<p v-if="sponsorList.patreon || sponsorList.liberapay || sponsorList.opencollective" class="text-center mt-1 mr-2">
-													<button type="button" @click="showSponsorModal" class="btn btn-sm btn-outline-secondary font-weight-bold py-0">
-														Donate
-													</button>
-												</p>
-											</div>
-											<div class="col-7 pl-2">
-												<p class="align-middle">
+	</div>
+	<div v-if="loading" style="height: 80vh;" class="d-flex justify-content-center align-items-center">
+		<img src="/img/pixelfed-icon-grey.svg" class="">
+	</div>
+	<div v-if="!loading && !warning">
+		<div v-if="profileLayout == 'metro'">
+			<div class="bg-white py-5 border-bottom">
+				<div class="container">
+					<div class="row">
+						<div class="col-12 col-md-4 d-flex">
+							<div class="profile-avatar mx-md-auto">
+								<div class="d-block d-md-none">
+									<div class="row">
+										<div class="col-5">
+											<img class="rounded-circle box-shadow mr-2" :src="profile.avatar" width="77px" height="77px">
+											<p v-if="sponsorList.patreon || sponsorList.liberapay || sponsorList.opencollective" class="text-center mt-1 mr-2">
+												<button type="button" @click="showSponsorModal" class="btn btn-sm btn-outline-secondary font-weight-bold py-0">
+													Donate
+												</button>
+											</p>
+										</div>
+										<div class="col-7 pl-2">
+											<p class="align-middle">
 
-													<span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span>
-													<span class="float-right mb-0" v-if="!loading && profile.id != user.id && user.hasOwnProperty('id')">
-														<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
-													</span>
+												<span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span>
+												<span class="float-right mb-0" v-if="!loading && profile.id != user.id && user.hasOwnProperty('id')">
+													<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
+												</span>
+											</p>
+											<p v-if="!loading && profile.id == user.id && user.hasOwnProperty('id')">
+												<a class="btn btn-outline-dark py-0 px-4 mt-3" href="/settings/home">Edit Profile</a>
+											</p>
+											<div v-if="profile.id != user.id && user.hasOwnProperty('id')">
+												<p class="mt-3 mb-0" v-if="relationship.following == true">
+													<button type="button"  class="btn btn-outline-dark font-weight-bold px-4 py-0" v-on:click="followProfile()" data-toggle="tooltip" title="Unfollow">Unfollow</button>
 												</p>
-												<p v-if="!loading && profile.id == user.id && user.hasOwnProperty('id')">
-													<a class="btn btn-outline-dark py-0 px-4 mt-3" href="/settings/home">Edit Profile</a>
+												<p class="mt-3 mb-0" v-if="!relationship.following">
+													<button type="button" class="btn btn-outline-dark font-weight-bold px-4 py-0" v-on:click="followProfile()" data-toggle="tooltip" title="Follow">Follow</button>
 												</p>
-												<div v-if="profile.id != user.id && user.hasOwnProperty('id')">
-													<p class="mt-3 mb-0" v-if="relationship.following == true">
-														<button type="button"  class="btn btn-outline-dark font-weight-bold px-4 py-0" v-on:click="followProfile()" data-toggle="tooltip" title="Unfollow">Unfollow</button>
-													</p>
-													<p class="mt-3 mb-0" v-if="!relationship.following">
-														<button type="button" class="btn btn-outline-dark font-weight-bold px-4 py-0" v-on:click="followProfile()" data-toggle="tooltip" title="Follow">Follow</button>
-													</p>
-												</div>
 											</div>
 										</div>
 									</div>
-									<div class="d-none d-md-block">
-										<img class="rounded-circle box-shadow" :src="profile.avatar" width="172px" height="172px">
-										<p v-if="sponsorList.patreon || sponsorList.liberapay || sponsorList.opencollective" class="text-center mt-3">
-											<button type="button" @click="showSponsorModal" class="btn btn-outline-secondary font-weight-bold py-0">
-												<i class="fas fa-heart text-danger"></i>
-												Donate
+								</div>
+								<div class="d-none d-md-block">
+									<img class="rounded-circle box-shadow" :src="profile.avatar" width="172px" height="172px">
+									<p v-if="sponsorList.patreon || sponsorList.liberapay || sponsorList.opencollective" class="text-center mt-3">
+										<button type="button" @click="showSponsorModal" class="btn btn-outline-secondary font-weight-bold py-0">
+											<i class="fas fa-heart text-danger"></i>
+											Donate
+										</button>
+									</p>
+								</div>
+							</div>
+						</div>
+						<div class="col-12 col-md-8 d-flex align-items-center">
+							<div class="profile-details">
+								<div class="d-none d-md-flex username-bar pb-2 align-items-center">
+									<span class="font-weight-ultralight h3">{{profile.username}}</span>
+									<span class="pl-4" v-if="profile.is_admin">
+										<span class="btn btn-outline-secondary font-weight-bold py-0">ADMIN</span>
+									</span>
+									<span class="pl-4">
+										<a :href="'/users/'+profile.username+'.atom'" class="fas fa-rss fa-lg text-muted text-decoration-none"></a>
+									</span>
+									<span class="pl-4" v-if="owner && user.hasOwnProperty('id')">
+										<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="/settings/home"></a>
+									</span>
+									<span class="pl-4" v-if="!owner && user.hasOwnProperty('id')">
+										<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
+									</span>
+									<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
+										<span class="pl-4" v-if="relationship.following == true">
+											<button type="button"  class="btn btn-outline-secondary font-weight-bold btn-sm" v-on:click="followProfile()" data-toggle="tooltip" title="Unfollow"><i class="fas fa-user-minus"></i></button>
+										</span>
+										<span class="pl-4" v-if="!relationship.following">
+											<button type="button" class="btn btn-primary font-weight-bold btn-sm" v-on:click="followProfile()" data-toggle="tooltip" title="Follow"><i class="fas fa-user-plus"></i></button>
+										</span>
+									</span>
+								</div>
+								<div class="d-none d-md-inline-flex profile-stats pb-3 lead">
+									<div class="font-weight-light pr-5">
+										<a class="text-dark" :href="profile.url">
+											<span class="font-weight-bold">{{profile.statuses_count}}</span>
+											Posts
+										</a>
+									</div>
+									<div v-if="profileSettings.followers.count" class="font-weight-light pr-5">
+										<a class="text-dark cursor-pointer" v-on:click="followersModal()">
+											<span class="font-weight-bold">{{profile.followers_count}}</span>
+											Followers
+										</a>
+									</div>
+									<div v-if="profileSettings.following.count" class="font-weight-light">
+										<a class="text-dark cursor-pointer" v-on:click="followingModal()">
+											<span class="font-weight-bold">{{profile.following_count}}</span>
+											Following
+										</a>
+									</div>
+								</div>
+								<p class="lead mb-0 d-flex align-items-center pt-3">
+									<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
+								</p>
+								<div v-if="profile.note" class="mb-0 lead" v-html="profile.note"></div>
+								<p v-if="profile.website" class=""><a :href="profile.website" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{profile.website}}</a></p>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="d-block d-md-none bg-white my-0 py-2 border-bottom">
+				<ul class="nav d-flex justify-content-center">
+					<li class="nav-item">
+						<div class="font-weight-light">
+							<span class="text-dark text-center">
+								<p class="font-weight-bold mb-0">{{profile.statuses_count}}</p>
+								<p class="text-muted mb-0">Posts</p>
+							</span>
+						</div>
+					</li>
+					<li class="nav-item px-5">
+						<div v-if="profileSettings.followers.count" class="font-weight-light">
+							<a class="text-dark cursor-pointer text-center" v-on:click="followersModal()">
+								<p class="font-weight-bold mb-0">{{profile.followers_count}}</p>
+								<p class="text-muted mb-0">Followers</p>
+							</a>
+						</div>
+					</li>
+					<li class="nav-item">
+						<div v-if="profileSettings.following.count" class="font-weight-light">
+							<a class="text-dark cursor-pointer text-center" v-on:click="followingModal()">
+								<p class="font-weight-bold mb-0">{{profile.following_count}}</p>
+								<p class="text-muted mb-0">Following</p>
+							</a>
+						</div>
+					</li>
+				</ul>
+			</div>
+			<div class="bg-white">
+				<ul class="nav nav-topbar d-flex justify-content-center border-0">
+
+					<li class="nav-item">
+						<a :class="this.mode == 'grid' ? 'nav-link font-weight-bold text-uppercase text-primary' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('grid')"><i class="fas fa-th fa-lg"></i></a>
+					</li>
+
+					<li class="nav-item px-3">
+						<a :class="this.mode == 'list' ? 'nav-link font-weight-bold text-uppercase text-primary' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('list')"><i class="fas fa-th-list fa-lg"></i></a>
+					</li>
+					<!-- <li class="nav-item pr-3">
+						<a :class="this.mode == 'collections' ? 'nav-link font-weight-bold text-uppercase text-primary' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('collections')"><i class="fas fa-images fa-lg"></i></a>
+					</li> -->
+					<li class="nav-item" v-if="owner">
+						<a :class="this.mode == 'bookmarks' ? 'nav-link font-weight-bold text-uppercase text-primary' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('bookmarks')"><i class="fas fa-bookmark fa-lg"></i></a>
+					</li>
+				</ul>
+			</div>
+
+			<div class="container">
+				<div class="profile-timeline mt-md-4">
+					<div class="row" v-if="mode == 'grid'">
+						<div class="col-4 p-0 p-sm-2 p-md-3 p-xs-1" v-for="(s, index) in timeline">
+							<a class="card info-overlay card-md-border-0" :href="s.url">
+								<div class="square">
+									<span v-if="s.pf_type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
+									<span v-if="s.pf_type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
+									<span v-if="s.pf_type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
+									<div class="square-content" v-bind:style="previewBackground(s)">
+									</div>
+									<div class="info-overlay-text">
+										<h5 class="text-white m-auto font-weight-bold">
+											<span>
+												<span class="far fa-heart fa-lg p-2 d-flex-inline"></span>
+												<span class="d-flex-inline">{{s.favourites_count}}</span>
+											</span>
+											<span>
+												<span class="fas fa-retweet fa-lg p-2 d-flex-inline"></span>
+												<span class="d-flex-inline">{{s.reblogs_count}}</span>
+											</span>
+										</h5>
+									</div>
+								</div>
+							</a>
+						</div>
+					</div>
+					<div class="row" v-if="mode == 'list'">
+						<div class="col-md-8 col-lg-8 offset-md-2 px-0 mb-3 timeline">
+							<div class="card status-card card-md-rounded-0 my-sm-2 my-md-3 my-lg-4" :data-status-id="status.id" v-for="(status, index) in timeline" :key="status.id">
+
+								<div class="card-header d-inline-flex align-items-center bg-white">
+									<img v-bind:src="status.account.avatar" width="32px" height="32px" style="border-radius: 32px;">
+									<a class="username font-weight-bold pl-2 text-dark" v-bind:href="status.account.url">
+										{{status.account.username}}
+									</a>
+									<div v-if="user.hasOwnProperty('id')" class="text-right" style="flex-grow:1;">
+										<div class="dropdown">
+											<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
+												<span class="fas fa-ellipsis-v fa-lg text-muted"></span>
 											</button>
+											<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+												<a class="dropdown-item font-weight-bold" :href="status.url">Go to post</a>
+												<span v-if="status.account.id != user.id">
+													<a class="dropdown-item font-weight-bold" :href="reportUrl(status)">Report</a>
+													<a class="dropdown-item font-weight-bold" v-on:click="muteProfile(status)">Mute Profile</a>
+													<a class="dropdown-item font-weight-bold" v-on:click="blockProfile(status)">Block Profile</a>
+												</span>
+												<span  v-if="status.account.id == user.id || user.is_admin == true">
+													<a class="dropdown-item font-weight-bold" :href="editUrl(status)">Edit</a>
+													<a class="dropdown-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a>
+												</span>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="postPresenterContainer">
+									<div v-if="status.pf_type === 'photo'" class="w-100">
+										<photo-presenter :status="status"></photo-presenter>
+									</div>
+
+									<div v-else-if="status.pf_type === 'video'" class="w-100">
+										<video-presenter :status="status"></video-presenter>
+									</div>
+
+									<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
+										<photo-album-presenter :status="status"></photo-album-presenter>
+									</div>
+
+									<div v-else-if="status.pf_type === 'video:album'" class="w-100">
+										<video-album-presenter :status="status"></video-album-presenter>
+									</div>
+
+									<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
+										<mixed-album-presenter :status="status"></mixed-album-presenter>
+									</div>
+
+									<div v-else class="w-100">
+										<p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+									</div>
+								</div>
+
+								<div class="card-body">
+									<div class="reactions my-1" v-if="user.hasOwnProperty('id')">
+										<h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3>
+										<h3 class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
+										<h3 v-if="status.visibility == 'public'" v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3>
+									</div>
+
+									<div class="likes font-weight-bold">
+										<span class="like-count">{{status.favourites_count}}</span> {{status.favourites_count == 1 ? 'like' : 'likes'}}
+									</div>
+									<div class="caption">
+										<p class="mb-2 read-more" style="overflow: hidden;">
+											<span class="username font-weight-bold">
+												<bdi><a class="text-dark" :href="status.account.url">{{status.account.username}}</a></bdi>
+											</span>
+											<span v-html="status.content"></span>
+										</p>
+									</div>
+									<div class="comments">
+									</div>
+									<div class="timestamp pt-1">
+										<p class="small text-uppercase mb-0">
+											<a :href="status.url" class="text-muted">
+												<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
+											</a>
 										</p>
 									</div>
 								</div>
+
+								<div class="card-footer bg-white d-none">
+									<form class="" v-on:submit.prevent="commentSubmit(status, $event)">
+										<input type="hidden" name="item" value="">
+										<input class="form-control status-reply-input" name="comment" placeholder="Add a comment…" autocomplete="off">
+									</form>
+								</div>
 							</div>
-							<div class="col-12 col-md-8 d-flex align-items-center">
-								<div class="profile-details">
-									<div class="d-none d-md-flex username-bar pb-2 align-items-center">
-										<span class="font-weight-ultralight h3">{{profile.username}}</span>
-										<span class="pl-4" v-if="profile.is_admin">
-											<span class="btn btn-outline-secondary font-weight-bold py-0">ADMIN</span>
-										</span>
-										<span class="pl-4">
-											<a :href="'/users/'+profile.username+'.atom'" class="fas fa-rss fa-lg text-muted text-decoration-none"></a>
-										</span>
-										<span class="pl-4" v-if="owner && user.hasOwnProperty('id')">
-											<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="/settings/home"></a>
-										</span>
-										<span class="pl-4" v-if="!owner && user.hasOwnProperty('id')">
-											<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
-										</span>
-										<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
-											<span class="pl-4" v-if="relationship.following == true">
-												<button type="button"  class="btn btn-outline-secondary font-weight-bold btn-sm" v-on:click="followProfile()" data-toggle="tooltip" title="Unfollow"><i class="fas fa-user-minus"></i></button>
-											</span>
-											<span class="pl-4" v-if="!relationship.following">
-												<button type="button" class="btn btn-primary font-weight-bold btn-sm" v-on:click="followProfile()" data-toggle="tooltip" title="Follow"><i class="fas fa-user-plus"></i></button>
-											</span>
-										</span>
+						</div>
+					</div>
+					<div v-if="timeline.length && ['grid','list'].indexOf(mode) != -1">
+						<infinite-loading @infinite="infiniteTimeline">
+							<div slot="no-more"></div>
+							<div slot="no-results"></div>
+						</infinite-loading>
+					</div>
+					<div class="row" v-if="mode == 'bookmarks'">
+						<div class="col-4 p-0 p-sm-2 p-md-3 p-xs-1" v-for="(s, index) in bookmarks">
+							<a class="card info-overlay card-md-border-0" :href="s.url">
+								<div class="square">
+									<span v-if="s.pf_type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
+									<span v-if="s.pf_type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
+									<span v-if="s.pf_type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
+									<div class="square-content" v-bind:style="previewBackground(s)">
 									</div>
-									<div class="d-none d-md-inline-flex profile-stats pb-3 lead">
-										<div class="font-weight-light pr-5">
-											<a class="text-dark" :href="profile.url">
-												<span class="font-weight-bold">{{profile.statuses_count}}</span>
-												Posts
-											</a>
-										</div>
-										<div v-if="profileSettings.followers.count" class="font-weight-light pr-5">
-											<a class="text-dark cursor-pointer" v-on:click="followersModal()">
-												<span class="font-weight-bold">{{profile.followers_count}}</span>
-												Followers
-											</a>
-										</div>
-										<div v-if="profileSettings.following.count" class="font-weight-light">
-											<a class="text-dark cursor-pointer" v-on:click="followingModal()">
-												<span class="font-weight-bold">{{profile.following_count}}</span>
-												Following
-											</a>
-										</div>
+									<div class="info-overlay-text">
+										<h5 class="text-white m-auto font-weight-bold">
+											<span>
+												<span class="far fa-heart fa-lg p-2 d-flex-inline"></span>
+												<span class="d-flex-inline">{{s.favourites_count}}</span>
+											</span>
+											<span>
+												<span class="fas fa-retweet fa-lg p-2 d-flex-inline"></span>
+												<span class="d-flex-inline">{{s.reblogs_count}}</span>
+											</span>
+										</h5>
 									</div>
-									<p class="lead mb-0 d-flex align-items-center pt-3">
-										<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
-									</p>
-									<div v-if="profile.note" class="mb-0 lead" v-html="profile.note"></div>
-									<p v-if="profile.website" class=""><a :href="profile.website" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{profile.website}}</a></p>
+								</div>
+							</a>
+						</div>
+					</div>
+					<div class="row" v-if="mode == 'collections'">
+						<p class="text-center">Collections here</p>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div v-if="profileLayout == 'moment'">
+			<div :class="momentBackground()" style="width:100%;min-height:274px;">
+			</div>
+			<div class="bg-white border-bottom">
+				<div class="container">
+					<div class="row">
+						<div class="col-12 row mx-0">
+							<div class="col-4"></div>
+							<div class="col-4 text-center">
+								<div class="d-block d-md-none">
+									<img class="rounded-circle box-shadow" :src="profile.avatar" width="110px" height="110px" style="margin-top:-60px; border: 5px solid #fff">
+								</div>
+								<div class="d-none d-md-block">
+									<img class="rounded-circle box-shadow" :src="profile.avatar" width="172px" height="172px" style="margin-top:-90px; border: 5px solid #fff">
+								</div>
+							</div>
+							<div class="col-4 text-right mt-2">
+								<span class="d-none d-md-inline-block pl-4">
+									<a :href="'/users/'+profile.username+'.atom'" class="fas fa-rss fa-lg text-muted text-decoration-none"></a>
+								</span>
+								<span class="pl-md-4 pl-sm-2" v-if="owner">
+									<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="/settings/home"></a>
+								</span>
+								<span class="pl-md-4 pl-sm-2" v-if="profile.id != user.id && user.hasOwnProperty('id')">
+									<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
+								</span>
+								<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
+									<span class="pl-md-4 pl-sm-2" v-if="relationship.following == true">
+										<button type="button"  class="btn btn-outline-secondary font-weight-bold btn-sm" @click.prevent="followProfile()" data-toggle="tooltip" title="Unfollow">Unfollow</button>
+									</span>
+									<span class="pl-md-4 pl-sm-2" v-else>
+										<button type="button" class="btn btn-primary font-weight-bold btn-sm" @click.prevent="followProfile()" data-toggle="tooltip" title="Follow">Follow</button>
+									</span>
+								</span>
+							</div>
+						</div>
+
+						<div class="col-12 text-center">
+							<div class="profile-details my-3">
+								<p class="font-weight-ultralight h2 text-center">{{profile.username}}</p>
+								<div v-if="profile.note" class="text-center text-muted p-3" v-html="profile.note"></div>
+								<div class="pb-3 text-muted text-center">
+									<a class="text-lighter" :href="profile.url">
+										<span class="font-weight-bold">{{profile.statuses_count}}</span>
+										Posts
+									</a>
+									<a v-if="profileSettings.followers.count" class="text-lighter cursor-pointer px-3" v-on:click="followersModal()">
+										<span class="font-weight-bold">{{profile.followers_count}}</span>
+										Followers
+									</a>
+									<a v-if="profileSettings.following.count" class="text-lighter cursor-pointer" v-on:click="followingModal()">
+										<span class="font-weight-bold">{{profile.following_count}}</span>
+										Following
+									</a>
 								</div>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div class="d-block d-md-none bg-white my-0 py-2 border-bottom">
-					<ul class="nav d-flex justify-content-center">
-						<li class="nav-item">
-							<div class="font-weight-light">
-								<span class="text-dark text-center">
-									<p class="font-weight-bold mb-0">{{profile.statuses_count}}</p>
-									<p class="text-muted mb-0">Posts</p>
-								</span>
-							</div>
-						</li>
-						<li class="nav-item px-5">
-							<div v-if="profileSettings.followers.count" class="font-weight-light">
-								<a class="text-dark cursor-pointer text-center" v-on:click="followersModal()">
-									<p class="font-weight-bold mb-0">{{profile.followers_count}}</p>
-									<p class="text-muted mb-0">Followers</p>
-								</a>
-							</div>
-						</li>
-						<li class="nav-item">
-							<div v-if="profileSettings.following.count" class="font-weight-light">
-								<a class="text-dark cursor-pointer text-center" v-on:click="followingModal()">
-									<p class="font-weight-bold mb-0">{{profile.following_count}}</p>
-									<p class="text-muted mb-0">Following</p>
-								</a>
-							</div>
-						</li>
-					</ul>
-				</div>
-				<div class="bg-white">
-					<ul class="nav nav-topbar d-flex justify-content-center border-0">
-<!-- 			<li class="nav-item">
-				<a class="nav-link active font-weight-bold text-uppercase" :href="profile.url">Posts</a>
-			</li>
-		-->
-		<li class="nav-item">
-			<a :class="this.mode == 'grid' ? 'nav-link font-weight-bold text-uppercase text-primary' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('grid')"><i class="fas fa-th fa-lg"></i></a>
-		</li>
-
-<!-- <li class="nav-item">
-	<a :class="this.mode == 'masonry' ? 'nav-link font-weight-bold text-uppercase active' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('masonry')"><i class="fas fa-th-large"></i></a>
-</li> -->
-
-<li class="nav-item px-3">
-	<a :class="this.mode == 'list' ? 'nav-link font-weight-bold text-uppercase text-primary' : 'nav-link font-weight-bold text-uppercase'" href="#" v-on:click.prevent="switchMode('list')"><i class="fas fa-th-list fa-lg"></i></a>
-</li>
-
-<li class="nav-item" v-if="owner">
-	<a class="nav-link font-weight-bold text-uppercase" :href="profile.url + '/saved'">Saved</a>
-</li>
-</ul>
-</div>
-
-<div class="container">
-	<div class="profile-timeline mt-md-4">
-		<div class="row" v-if="mode == 'grid'">
-			<div class="col-4 p-0 p-sm-2 p-md-3 p-xs-1" v-for="(s, index) in timeline">
-				<a class="card info-overlay card-md-border-0" :href="s.url">
-					<div class="square">
-						<span v-if="s.pf_type == 'photo:album'" class="float-right mr-3 post-icon"><i class="fas fa-images fa-2x"></i></span>
-						<span v-if="s.pf_type == 'video'" class="float-right mr-3 post-icon"><i class="fas fa-video fa-2x"></i></span>
-						<span v-if="s.pf_type == 'video:album'" class="float-right mr-3 post-icon"><i class="fas fa-film fa-2x"></i></span>
-						<div class="square-content" v-bind:style="previewBackground(s)">
-						</div>
-						<div class="info-overlay-text">
-							<h5 class="text-white m-auto font-weight-bold">
-								<span>
-									<span class="far fa-heart fa-lg p-2 d-flex-inline"></span>
-									<span class="d-flex-inline">{{s.favourites_count}}</span>
-								</span>
-								<span>
-									<span class="fas fa-retweet fa-lg p-2 d-flex-inline"></span>
-									<span class="d-flex-inline">{{s.reblogs_count}}</span>
-								</span>
-							</h5>
+			</div>
+			<div class="container-fluid">
+				<div class="profile-timeline mt-md-4">
+					<div class="card-columns" v-if="mode == 'grid'">
+						<div class="p-sm-2 p-md-3" v-for="(s, index) in timeline">
+							<a class="card info-overlay card-md-border-0" :href="s.url">
+								<img :src="previewUrl(s)" class="img-fluid w-100">
+							</a>
 						</div>
 					</div>
-				</a>
+					<div v-if="timeline.length">
+						<infinite-loading @infinite="infiniteTimeline">
+							<div slot="no-more"></div>
+							<div slot="no-results"></div>
+						</infinite-loading>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div class="row" v-if="mode == 'list'">
-			<div class="col-md-8 col-lg-8 offset-md-2 px-0 mb-3 timeline">
-				<div class="card status-card card-md-rounded-0 my-sm-2 my-md-3 my-lg-4" :data-status-id="status.id" v-for="(status, index) in timeline" :key="status.id">
-
-					<div class="card-header d-inline-flex align-items-center bg-white">
-						<img v-bind:src="status.account.avatar" width="32px" height="32px" style="border-radius: 32px;">
-						<a class="username font-weight-bold pl-2 text-dark" v-bind:href="status.account.url">
-							{{status.account.username}}
+	</div>
+	<b-modal ref="followingModal"
+	id="following-modal"
+	hide-footer
+	centered
+	title="Following"
+	body-class="list-group-flush p-0">
+	<div class="list-group">
+		<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
+			<div class="media">
+				<a :href="user.url">
+					<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
+				</a>
+				<div class="media-body">
+					<p class="mb-0" style="font-size: 14px">
+						<a :href="user.url" class="font-weight-bold text-dark">
+							{{user.username}}
 						</a>
-						<div v-if="user.hasOwnProperty('id')" class="text-right" style="flex-grow:1;">
-							<div class="dropdown">
-								<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
-									<span class="fas fa-ellipsis-v fa-lg text-muted"></span>
-								</button>
-								<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
-									<a class="dropdown-item font-weight-bold" :href="status.url">Go to post</a>
-									<span v-if="status.account.id != user.id">
-										<a class="dropdown-item font-weight-bold" :href="reportUrl(status)">Report</a>
-										<a class="dropdown-item font-weight-bold" v-on:click="muteProfile(status)">Mute Profile</a>
-										<a class="dropdown-item font-weight-bold" v-on:click="blockProfile(status)">Block Profile</a>
-									</span>
-									<span  v-if="status.account.id == user.id || user.is_admin == true">
-										<a class="dropdown-item font-weight-bold" :href="editUrl(status)">Edit</a>
-										<a class="dropdown-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a>
-									</span>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div class="postPresenterContainer">
-						<div v-if="status.pf_type === 'photo'" class="w-100">
-							<photo-presenter :status="status"></photo-presenter>
-						</div>
-
-						<div v-else-if="status.pf_type === 'video'" class="w-100">
-							<video-presenter :status="status"></video-presenter>
-						</div>
-
-						<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
-							<photo-album-presenter :status="status"></photo-album-presenter>
-						</div>
-
-						<div v-else-if="status.pf_type === 'video:album'" class="w-100">
-							<video-album-presenter :status="status"></video-album-presenter>
-						</div>
-
-						<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
-							<mixed-album-presenter :status="status"></mixed-album-presenter>
-						</div>
-
-						<div v-else class="w-100">
-							<p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
-						</div>
-					</div>
-
-					<div class="card-body">
-						<div class="reactions my-1" v-if="user.hasOwnProperty('id')">
-							<h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3>
-							<h3 class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
-							<h3 v-if="status.visibility == 'public'" v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3>
-						</div>
-
-						<div class="likes font-weight-bold">
-							<span class="like-count">{{status.favourites_count}}</span> {{status.favourites_count == 1 ? 'like' : 'likes'}}
-						</div>
-						<div class="caption">
-							<p class="mb-2 read-more" style="overflow: hidden;">
-								<span class="username font-weight-bold">
-									<bdi><a class="text-dark" :href="status.account.url">{{status.account.username}}</a></bdi>
-								</span>
-								<span v-html="status.content"></span>
-							</p>
-						</div>
-						<div class="comments">
-						</div>
-						<div class="timestamp pt-1">
-							<p class="small text-uppercase mb-0">
-								<a :href="status.url" class="text-muted">
-									<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
-								</a>
-							</p>
-						</div>
-					</div>
-
-					<div class="card-footer bg-white d-none">
-						<form class="" v-on:submit.prevent="commentSubmit(status, $event)">
-							<input type="hidden" name="item" value="">
-							<input class="form-control status-reply-input" name="comment" placeholder="Add a comment…" autocomplete="off">
-						</form>
-					</div>
+					</p>
+					<p class="text-muted mb-0" style="font-size: 14px">
+						{{user.display_name}}
+					</p>
+				</div>
+				<div v-if="owner">
+					<a class="btn btn-outline-secondary btn-sm" href="#" @click.prevent="followModalAction(user.id, index, 'following')">Unfollow</a>
 				</div>
 			</div>
 		</div>
-		<div class="masonry-grid" v-if="mode == 'masonry'">
-			<div class="d-inline p-0 p-sm-2 p-md-3 masonry-item" v-for="(status, index) in timeline">
-				<a class="" v-on:click.prevent="statusModal(status)" :href="status.url">
-					<img :src="previewUrl(status)" :class="'o-'+masonryOrientation(status)">
+		<div v-if="following.length == 0" class="list-group-item border-0">
+			<div class="list-group-item border-0">
+				<p class="p-3 text-center mb-0 lead">You are not following anyone.</p>
+			</div>
+		</div>
+		<div v-if="followingMore" class="list-group-item text-center" v-on:click="followingLoadMore()">
+			<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
+		</div>
+	</div>
+	</b-modal>
+	<b-modal ref="followerModal"
+	id="follower-modal"
+	hide-footer
+	centered
+	title="Followers"
+	body-class="list-group-flush p-0">
+	<div class="list-group">
+		<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
+			<div class="media">
+				<a :href="user.url">
+					<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
 				</a>
-			</div>
-		</div>
-		<div v-if="timeline.length">
-			<infinite-loading @infinite="infiniteTimeline">
-				<div slot="no-more"></div>
-				<div slot="no-results"></div>
-			</infinite-loading>
-		</div>
-	</div>
-</div>
-</div>
-
-<div v-if="profileLayout == 'moment'">
-	<div :class="momentBackground()" style="width:100%;min-height:274px;">
-	</div>
-	<div class="bg-white border-bottom">
-		<div class="container">
-			<div class="row">
-				<div class="col-12 row mx-0">
-					<div class="col-4"></div>
-					<div class="col-4 text-center">
-						<div class="d-block d-md-none">
-							<img class="rounded-circle box-shadow" :src="profile.avatar" width="110px" height="110px" style="margin-top:-60px; border: 5px solid #fff">
-						</div>
-						<div class="d-none d-md-block">
-							<img class="rounded-circle box-shadow" :src="profile.avatar" width="172px" height="172px" style="margin-top:-90px; border: 5px solid #fff">
-						</div>
-					</div>
-					<div class="col-4 text-right mt-2">
-						<span class="d-none d-md-inline-block pl-4">
-							<a :href="'/users/'+profile.username+'.atom'" class="fas fa-rss fa-lg text-muted text-decoration-none"></a>
-						</span>
-						<span class="pl-md-4 pl-sm-2" v-if="owner">
-							<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="/settings/home"></a>
-						</span>
-						<span class="pl-md-4 pl-sm-2" v-if="profile.id != user.id && user.hasOwnProperty('id')">
-							<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
-						</span>
-						<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
-							<span class="pl-md-4 pl-sm-2" v-if="relationship.following == true">
-								<button type="button"  class="btn btn-outline-secondary font-weight-bold btn-sm" @click.prevent="followProfile()" data-toggle="tooltip" title="Unfollow">Unfollow</button>
-							</span>
-							<span class="pl-md-4 pl-sm-2" v-else>
-								<button type="button" class="btn btn-primary font-weight-bold btn-sm" @click.prevent="followProfile()" data-toggle="tooltip" title="Follow">Follow</button>
-							</span>
-						</span>
-					</div>
-				</div>
-
-				<div class="col-12 text-center">
-					<div class="profile-details my-3">
-						<p class="font-weight-ultralight h2 text-center">{{profile.username}}</p>
-						<div v-if="profile.note" class="text-center text-muted p-3" v-html="profile.note"></div>
-						<div class="pb-3 text-muted text-center">
-							<a class="text-lighter" :href="profile.url">
-								<span class="font-weight-bold">{{profile.statuses_count}}</span>
-								Posts
-							</a>
-							<a v-if="profileSettings.followers.count" class="text-lighter cursor-pointer px-3" v-on:click="followersModal()">
-								<span class="font-weight-bold">{{profile.followers_count}}</span>
-								Followers
-							</a>
-							<a v-if="profileSettings.following.count" class="text-lighter cursor-pointer" v-on:click="followingModal()">
-								<span class="font-weight-bold">{{profile.following_count}}</span>
-								Following
-							</a>
-						</div>
-					</div>
+				<div class="media-body">
+					<p class="mb-0" style="font-size: 14px">
+						<a :href="user.url" class="font-weight-bold text-dark">
+							{{user.username}}
+						</a>
+					</p>
+					<p class="text-muted mb-0" style="font-size: 14px">
+						{{user.display_name}}
+					</p>
 				</div>
 			</div>
 		</div>
-	</div>
-	<div class="container-fluid">
-		<div class="profile-timeline mt-md-4">
-			<div class="card-columns" v-if="mode == 'grid'">
-				<div class="p-sm-2 p-md-3" v-for="(s, index) in timeline">
-					<a class="card info-overlay card-md-border-0" :href="s.url">
-						<img :src="previewUrl(s)" class="img-fluid w-100">
-					</a>
-				</div>
-			</div>
-			<div v-if="timeline.length">
-				<infinite-loading @infinite="infiniteTimeline">
-					<div slot="no-more"></div>
-					<div slot="no-results"></div>
-				</infinite-loading>
-			</div>
+		<div v-if="followerMore" class="list-group-item text-center" v-on:click="followersLoadMore()">
+			<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
 		</div>
 	</div>
-</div>
-</div>
-<!-- <b-modal id="statusModal" ref="statusModalRef" hide-footer hide-header v-if="modalStatus" size="lg" v-on:hide.native="closeModal()" lazy class="border-0">
-<post-component v-bind:status-template="modalStatus.pf_type" v-bind:status-id="modalStatus.id" v-bind:status-username="modalStatus.account.username" v-bind:status-url="modalStatus.url" v-bind:status-profile-url="modalStatus.account.url" v-bind:status-avatar="modalStatus.account.avatar"></post-component>
-</b-modal> -->
-<b-modal ref="followingModal"
-id="following-modal"
-hide-footer
-centered
-title="Following"
-body-class="list-group-flush p-0">
-<div class="list-group">
-	<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
-		<div class="media">
-			<a :href="user.url">
-				<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
-			</a>
-			<div class="media-body">
-				<p class="mb-0" style="font-size: 14px">
-					<a :href="user.url" class="font-weight-bold text-dark">
-						{{user.username}}
-					</a>
-				</p>
-				<p class="text-muted mb-0" style="font-size: 14px">
-					{{user.display_name}}
-				</p>
-			</div>
-			<div v-if="owner">
-				<a class="btn btn-outline-secondary btn-sm" href="#" @click.prevent="followModalAction(user.id, index, 'following')">Unfollow</a>
-			</div>
+	</b-modal>
+	<b-modal ref="visitorContextMenu"
+	id="visitor-context-menu"
+	hide-footer
+	hide-header
+	centered
+	size="sm"
+	body-class="list-group-flush p-0">
+	<div class="list-group" v-if="relationship">
+		<div v-if="!owner && !relationship.following" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-primary" @click="followProfile">
+			Follow
+		</div>
+		<div v-if="!owner && relationship.following" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded" @click="followProfile">
+			Unfollow
+		</div>
+		<div v-if="!owner && !relationship.muting" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded" @click="muteProfile">
+			Mute
+		</div>
+		<div v-if="!owner && relationship.muting" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded" @click="unmuteProfile">
+			Unmute
+		</div>
+		<div v-if="!owner" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-danger" @click="reportProfile">
+			Report User
+		</div>
+		<div v-if="!owner && !relationship.blocking" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-danger" @click="blockProfile">
+			Block
+		</div>
+		<div v-if="!owner && relationship.blocking" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-danger" @click="unblockProfile">
+			Unblock
+		</div>
+		<div class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-muted" @click="$refs.visitorContextMenu.hide()">
+			Close
 		</div>
 	</div>
-	<div v-if="following.length == 0" class="list-group-item border-0">
-		<div class="list-group-item border-0">
-			<p class="p-3 text-center mb-0 lead">You are not following anyone.</p>
-		</div>
+	</b-modal>
+	<b-modal ref="sponsorModal"
+	id="sponsor-modal"
+	hide-footer
+	:title="'Sponsor ' + profileUsername"
+	centered
+	size="md"
+	body-class="px-5">
+	<div>
+		<p class="font-weight-bold">External Links</p>
+		<p v-if="sponsorList.patreon" class="pt-2">
+			<a :href="'https://' + sponsorList.patreon" rel="nofollow" class="font-weight-bold">{{sponsorList.patreon}}</a>
+		</p>
+		<p v-if="sponsorList.liberapay" class="pt-2">
+			<a :href="'https://' + sponsorList.liberapay" rel="nofollow" class="font-weight-bold">{{sponsorList.liberapay}}</a>
+		</p>
+		<p v-if="sponsorList.opencollective" class="pt-2">
+			<a :href="'https://' + sponsorList.opencollective" rel="nofollow" class="font-weight-bold">{{sponsorList.opencollective}}</a>
+		</p>
 	</div>
-	<div v-if="followingMore" class="list-group-item text-center" v-on:click="followingLoadMore()">
-		<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
-	</div>
-</div>
-</b-modal>
-<b-modal ref="followerModal"
-id="follower-modal"
-hide-footer
-centered
-title="Followers"
-body-class="list-group-flush p-0">
-<div class="list-group">
-	<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
-		<div class="media">
-			<a :href="user.url">
-				<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" loading="lazy">
-			</a>
-			<div class="media-body">
-				<p class="mb-0" style="font-size: 14px">
-					<a :href="user.url" class="font-weight-bold text-dark">
-						{{user.username}}
-					</a>
-				</p>
-				<p class="text-muted mb-0" style="font-size: 14px">
-					{{user.display_name}}
-				</p>
-			</div>
-		</div>
-	</div>
-	<div v-if="followerMore" class="list-group-item text-center" v-on:click="followersLoadMore()">
-		<p class="mb-0 small text-muted font-weight-light cursor-pointer">Load more</p>
-	</div>
-</div>
-</b-modal>
-<b-modal ref="visitorContextMenu"
-id="visitor-context-menu"
-hide-footer
-hide-header
-centered
-size="sm"
-body-class="list-group-flush p-0">
-<div class="list-group" v-if="relationship">
-	<div v-if="!owner && !relationship.following" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-primary" @click="followProfile">
-		Follow
-	</div>
-	<div v-if="!owner && relationship.following" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded" @click="followProfile">
-		Unfollow
-	</div>
-	<div v-if="!owner && !relationship.muting" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded" @click="muteProfile">
-		Mute
-	</div>
-	<div v-if="!owner && relationship.muting" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded" @click="unmuteProfile">
-		Unmute
-	</div>
-	<div v-if="!owner" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-danger" @click="reportProfile">
-		Report User
-	</div>
-	<div v-if="!owner && !relationship.blocking" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-danger" @click="blockProfile">
-		Block
-	</div>
-	<div v-if="!owner && relationship.blocking" class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-danger" @click="unblockProfile">
-		Unblock
-	</div>
-	<div class="list-group-item cursor-pointer text-center font-weight-bold lead rounded text-muted" @click="$refs.visitorContextMenu.hide()">
-		Close
-	</div>
-</div>
-</b-modal>
-<b-modal ref="sponsorModal"
-id="sponsor-modal"
-hide-footer
-:title="'Sponsor ' + profileUsername"
-centered
-size="md"
-body-class="px-5">
-<div>
-	<p class="font-weight-bold">External Links</p>
-	<p v-if="sponsorList.patreon" class="pt-2">
-		<a :href="'https://' + sponsorList.patreon" rel="nofollow" class="font-weight-bold">{{sponsorList.patreon}}</a>
-	</p>
-	<p v-if="sponsorList.liberapay" class="pt-2">
-		<a :href="'https://' + sponsorList.liberapay" rel="nofollow" class="font-weight-bold">{{sponsorList.liberapay}}</a>
-	</p>
-	<p v-if="sponsorList.opencollective" class="pt-2">
-		<a :href="'https://' + sponsorList.opencollective" rel="nofollow" class="font-weight-bold">{{sponsorList.opencollective}}</a>
-	</p>
-</div>
-</b-modal>
+	</b-modal>
 </div>
 </template>
-<!-- <style type="text/css" scoped="">
-.modal-body {
-padding: 0;
-margin: 0;
-}
-@media (min-width: 992px) {
-.modal-lg, .modal-xl {
-max-width: 900px;
-}
-}
-</style> -->
 <style type="text/css" scoped>
 .o-square {
 	max-width: 320px;
@@ -558,7 +560,7 @@ max-width: 900px;
 				loading: true,
 				owner: false,
 				mode: 'grid',
-				modes: ['grid', 'list', 'masonry'],
+				modes: ['grid', 'list', 'masonry', 'bookmarks'],
 				modalStatus: false,
 				relationship: {},
 				followers: [],
@@ -569,6 +571,10 @@ max-width: 900px;
 				followingMore: true,
 				warning: false,
 				sponsorList: [],
+				bookmarks: [],
+				bookmarksPage: 2,
+				collections: [],
+				collectionsPage: 2
 			}
 		},
 		beforeMount() {
@@ -676,10 +682,10 @@ max-width: 900px;
 
 			switchMode(mode) {
 				this.mode = _.indexOf(this.modes, mode) ? mode : 'grid';
-				if(this.mode == 'masonry') {
-					$('.masonry').masonry({
-						columnWidth: 200,
-						itemSelector: '.masonry-item'
+				if(this.mode == 'bookmarks' && this.bookmarks.length == 0) {
+					axios.get('/api/local/bookmarks')
+					.then(res => {
+						this.bookmarks = res.data
 					});
 				}
 			},
diff --git a/routes/web.php b/routes/web.php
index 173f207d..6bedf540 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -90,7 +90,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
             Route::get('notifications', 'ApiController@notifications');
             Route::get('timelines/public', 'PublicApiController@publicTimelineApi');
             Route::get('timelines/home', 'PublicApiController@homeTimelineApi');
-            // Route::get('timelines/network', 'PublicApiController@homeTimelineApi');
         });
         Route::group(['prefix' => 'v2'], function() {
             Route::get('config', 'ApiController@siteConfiguration');
@@ -115,6 +114,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
             Route::post('discover/tag/subscribe', 'HashtagFollowController@store')->middleware('throttle:maxHashtagFollowsPerHour,60')->middleware('throttle:maxHashtagFollowsPerDay,1440');;
             Route::get('discover/tag/list', 'HashtagFollowController@getTags');
             Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get');
+            Route::get('bookmarks', 'InternalApiController@bookmarks');
         });
     });
 
@@ -201,7 +201,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
         Route::get('privacy/blocked-keywords', 'SettingsController@blockedKeywords')->name('settings.privacy.blocked-keywords');
         Route::post('privacy/account', 'SettingsController@privateAccountOptions')->name('settings.privacy.account');
         Route::get('reports', 'SettingsController@reportsHome')->name('settings.reports');
-        // Todo: Release in 0.7.2
         Route::group(['prefix' => 'remove', 'middleware' => 'dangerzone'], function() {
             Route::get('request/temporary', 'SettingsController@removeAccountTemporary')->name('settings.remove.temporary');
             Route::post('request/temporary', 'SettingsController@removeAccountTemporarySubmit');
@@ -304,7 +303,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
     Route::group(['prefix' => 'timeline'], function () {
         Route::redirect('/', '/');
         Route::get('public', 'TimelineController@local')->name('timeline.public');
-        // Route::get('network', 'TimelineController@network')->name('timeline.network');
     });
 
     Route::group(['prefix' => 'users'], function () {
@@ -321,7 +319,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
     Route::get('p/{username}/{id}/edit', 'StatusController@edit');
     Route::post('p/{username}/{id}/edit', 'StatusController@editStore');
     Route::get('p/{username}/{id}', 'StatusController@show');
-    Route::get('{username}/saved', 'ProfileController@savedBookmarks');
     Route::get('{username}/followers', 'ProfileController@followers')->middleware('auth');
     Route::get('{username}/following', 'ProfileController@following')->middleware('auth');
     Route::get('{username}', 'ProfileController@show');