diff --git a/templates/views/home.html b/templates/views/home.html
index 7ff7c5a..d3c303a 100644
--- a/templates/views/home.html
+++ b/templates/views/home.html
@@ -155,11 +155,11 @@
 					<md-tabs md-dynamic-height md-border-bottom>
 						<md-tab label="Messages">
 							<md-card ng-repeat = "msg in userMessages">
-								<div layout = "column" layout-padding>
+								<div layout = "row" layout-padding>
 									<div flex = "30" class="md-avatar">
 										<img ng-src="{{msg.user.avatar_url}}" style="width:100%">
 									</div>
-									<div flex = "20" layout = "row">
+									<div flex = "20" layout = "column">
 										<div>
 											{{msg.user.username}}
 										</div>
diff --git a/templates/views/project.html b/templates/views/project.html
index da09dc5..1736c1c 100644
--- a/templates/views/project.html
+++ b/templates/views/project.html
@@ -108,7 +108,7 @@
 									</div>
 									<md-content class="tabDesign">
 										<md-card ng-repeat = "msg in projectMessages">
-											<div layout = "row" layout-padding ng-if="!displayingMessages && msg.isProject">
+											<div layout = "row" layout-padding ng-if="!displayingMessages && msg.isProject && msg.groupId == project.id">
 												<div flex = "10">
 													<img ng-src="{{msg.user.avatar_url}}" style="width:80%">
 												</div>