diff --git a/resources/assets/js/components/DiscoverComponent.vue b/resources/assets/js/components/DiscoverComponent.vue
index 34bbe3224..51bab70ab 100644
--- a/resources/assets/js/components/DiscoverComponent.vue
+++ b/resources/assets/js/components/DiscoverComponent.vue
@@ -81,7 +81,7 @@
 					</div>
 				</div>
 			</section>
-			<section class="pt-5 mb-5 section-explore">
+			<section v-if="posts.length" class="pt-5 mb-5 section-explore">
 				<div class="profile-timeline pt-3">
 					<div class="row p-0 mt-5">
 						<!-- <div class="col-12 mb-3 d-flex justify-content-between align-items-center">
@@ -284,10 +284,10 @@
 				})
 				.then(res => {
 					if(this.trendingRange == 'daily') {
-						this.trendingDaily = res.data;
+						this.trendingDaily = res.data.filter(t => t.sensitive == false);
 					}
 					if(this.trendingRange == 'monthly') {
-						this.trendingMonthly = res.data;
+						this.trendingMonthly = res.data.filter(t => t.sensitive == false);
 					}
 					this.trending = res.data;
 				});
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index f33de86b0..7b6e219b2 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -16,8 +16,8 @@
 					</span>
 				</p>
 				<p class="mb-0 d-none d-md-block">
-					<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
-						<i class="fas fa-camera fa-lg pt-1"></i>
+					<a class="btn btn-block btn-primary btn-sm font-weight-bold" href="/i/compose" data-toggle="modal" data-target="#composeModal">
+					 New Post
 					</a>
 				</p>
 			</div>
@@ -379,8 +379,8 @@
 							</span>
 						</p>
 						<p class="mb-0 d-none d-md-block">
-							<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
-								<i class="fas fa-camera fa-lg pt-1"></i>
+							<a class="btn btn-block btn-primary btn-sm font-weight-bold" href="/i/compose" data-toggle="modal" data-target="#composeModal">
+								New Post
 							</a>
 						</p>
 					</div>