diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 1526f047d..6e7a657ed 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -323,7 +323,7 @@
 									</div>
 									<div class="like-count font-weight-bold mt-2 rounded border" style="cursor:pointer;" v-on:click="likesModal">
 
-										{{ownerOrAdmin() ? (status.liked_by.total_count + 1) : 0}}
+										{{ownerOrAdmin == true ? (status.liked_by.total_count + 1) : 0}}
 									</div>
 								</div>
 								<div class="text-center">
@@ -898,6 +898,10 @@ export default {
 				return;
 			}
 
+			if(u.has('ui') && u.get('ui') == 'moment' && this.layout != 'moment') {
+				this.layout = 'moment';
+			}
+
 			if(forceMetro == true || u.has('ui') && u.get('ui') == 'metro' && this.layout != 'metro') {
 				this.layout = 'metro';
 			}