diff --git a/www/application/views/home.php b/www/application/views/home.php
index 820fcf7..1c945f9 100644
--- a/www/application/views/home.php
+++ b/www/application/views/home.php
@@ -5,9 +5,7 @@
 // shouldn't need the title and links below
 ?>
 
-<title>Twitter Clone</title>
-<link type="text/css" rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="/css/styles.css">
+<!-- header used to be here -->
 
 <div class="home container">
 	<h1>All Tweets</h1>
@@ -19,17 +17,76 @@
 		</div>
 		<button class="btn btn-primary" type="submit" value="Search">Search</button>
 	</form>
+	<!-- DISPLAY ERROR IF NO SEARCH RESULTS FOUND -->
+	<?php
+		if($results === []){ ?>
+			<div class="tweet-container">
+				<div class="row">
+						<div class="col-md-6">
+							<?php echo "<h3>No tweets found</h3>"; ?>
 
+						</div>
+				</div>
+				<div class="row tweet">
+						<div class="col-md-12">
+							<?php echo "There are no tweets that match your query, please try another search.";?>
+						</div>
+				</div>
+			</div>
+		<?php }?>
+
+	<!-- OUTPUT SEARCH RESULTS -->
 	<?php foreach($results as $row){ ?>
 		<div class="tweet-container">
+			<?php
+				if($row['username'] === "mona") echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/mona.png\">";
+				else if($row['username'] === "chris") echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/chris.png\">";
+				else echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/anon.png\">";
+			 ?>
+			 <div class="tweet-data">
+				<div class="row">
+						<div class="col-md-6">
+							<?php echo "<h3>" . $row['first_name'] . " " . $row['last_name'] . " " . "<span class=\"handle\">" . "@" . $row['username'] . "</span>" . "</h3>"; ?>
+
+						</div>
+						<div class="col-md-3 date">
+							<?php
+		            $startDate = $row['date_time'];
+		            $start = new DateTime($startDate);
+		            $timestring = $start->format('m/d/y h:s A');
+		            $time_arr = str_split($timestring);
+		            if($time_arr[count($time_arr) - 8] === '0')
+		                unset($time_arr[count($time_arr) - 8]);
+		            echo implode("",$time_arr);
+		          ?>
+						</div>
+				</div>
+				<div class="row tweet italic">
+						<div class="col-md-6">
+							<?php echo "\"" . $row['tweet'] . "\"";?>
+						</div>
+				</div>
+			</div>
+		</div>
+	<?php } ?>
+
+	<!-- OUTPUT ALL TWEETS IF NOT ON SEARCH RESULT PAGE -->
+	<?php foreach($posts as $post){ ?>
+	<div class="tweet-container">
+		<!-- LOAD USER ICON -->
+		<?php
+			if($post['username'] === "mona") echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/mona.png\">";
+			else if($post['username'] === "chris") echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/chris.png\">";
+			else echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/anon.png\">";
+		 ?>
+		<div class="tweet-data">
 			<div class="row">
 					<div class="col-md-6">
-						<?php echo "<h3>" . $row['first_name'] . " " . $row['last_name'] . " " . "<span class=\"handle\">" . "@" . $row['username'] . "</span>" . "</h3>"; ?>
-
+						<?php echo "<h3>" . $post['first_name'] . " " . $post['last_name'] . " " . "<span class=\"handle\">" . "@" . $post['username'] . "</span>" . "</h3>"; ?>
 					</div>
 					<div class="col-md-3 date">
 						<?php
-	            $startDate = $row['date_time'];
+	            $startDate = $post['date_time'];
 	            $start = new DateTime($startDate);
 	            $timestring = $start->format('m/d/y h:s A');
 	            $time_arr = str_split($timestring);
@@ -40,36 +97,12 @@
 					</div>
 			</div>
 			<div class="row tweet italic">
-					<div class="col-md-12">
-						<?php echo "\"" . $row['tweet'] . "\"";?>
+					<div class="col-md-6">
+						<?php echo "\"" . $post['tweet'] . "\"";?>
 					</div>
 			</div>
 		</div>
-	<?php } ?>
 
-	<?php foreach($posts as $post){ ?>
-	<div class="tweet-container">
-		<div class="row">
-				<div class="col-md-6">
-					<?php echo "<h3>" . $post['first_name'] . " " . $post['last_name'] . " " . "<span class=\"handle\">" . "@" . $post['username'] . "</span>" . "</h3>"; ?>
-				</div>
-				<div class="col-md-3 date">
-					<?php
-            $startDate = $post['date_time'];
-            $start = new DateTime($startDate);
-            $timestring = $start->format('m/d/y h:s A');
-            $time_arr = str_split($timestring);
-            if($time_arr[count($time_arr) - 8] === '0')
-                unset($time_arr[count($time_arr) - 8]);
-            echo implode("",$time_arr);
-          ?>
-				</div>
-		</div>
-		<div class="row tweet italic">
-				<div class="col-md-12">
-					<?php echo "\"" . $post['tweet'] . "\"";?>
-				</div>
-		</div>
 	</div>
 	<?php }?>
 </div>
diff --git a/www/application/views/templates/nav.php b/www/application/views/templates/nav.php
index ae34f99..1b3560e 100644
--- a/www/application/views/templates/nav.php
+++ b/www/application/views/templates/nav.php
@@ -2,7 +2,7 @@
 <div class="container-fluid">
   <div class="navbar-header">
     <a class="navbar-brand" href="/index.php/all_tweets">
-      <img class="home-icon" alt="Brand" src="../../img/twitter.png">
+      <img class="home-icon" alt="Twitter" src="../../img/twitter.png">
     </a>
   </div>
   <ul class="nav navbar-nav">
diff --git a/www/application/views/user.php b/www/application/views/user.php
index 0b613a3..ccb1167 100644
--- a/www/application/views/user.php
+++ b/www/application/views/user.php
@@ -21,28 +21,37 @@
   </div>
 
   <?php foreach($posts as $post){ ?>
-	<div class="tweet-container">
-		<div class="row">
-				<div class="col-md-6">
-					<?php echo "<h3>" . $post['first_name'] . " " . $post['last_name'] . " " . "<span class=\"handle\">" . "@" . $post['username'] . "</span>" . "</h3>"; ?>
-				</div>
-				<div class="col-md-3 date">
-          <?php
-            $startDate = $post['date_time'];
-            $start = new DateTime($startDate);
-            $timestring = $start->format('m/d/y h:s A');
-            $time_arr = str_split($timestring);
-            if($time_arr[count($time_arr) - 8] === '0')
-                unset($time_arr[count($time_arr) - 8]);
-            echo implode("",$time_arr);
-          ?>
-				</div>
-		</div>
-		<div class="row tweet italic">
-				<div class="col-md-12">
-					<?php echo "\"" . $post['tweet'] . "\"";?>
-				</div>
-		</div>
-	</div>
+    <div class="tweet-container">
+  		<!-- LOAD USER ICON -->
+  		<?php
+  			if($post['username'] === "mona") echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/mona.png\">";
+  			else if($post['username'] === "chris") echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/chris.png\">";
+  			else echo "<img class=\"profile-icon\" alt=\"user\" src=\"../../img/anon.png\">";
+  		 ?>
+  		<div class="tweet-data">
+  			<div class="row">
+  					<div class="col-md-6">
+  						<?php echo "<h3>" . $post['first_name'] . " " . $post['last_name'] . " " . "<span class=\"handle\">" . "@" . $post['username'] . "</span>" . "</h3>"; ?>
+  					</div>
+  					<div class="col-md-3 date">
+  						<?php
+  	            $startDate = $post['date_time'];
+  	            $start = new DateTime($startDate);
+  	            $timestring = $start->format('m/d/y h:s A');
+  	            $time_arr = str_split($timestring);
+  	            if($time_arr[count($time_arr) - 8] === '0')
+  	                unset($time_arr[count($time_arr) - 8]);
+  	            echo implode("",$time_arr);
+  	          ?>
+  					</div>
+  			</div>
+  			<div class="row tweet italic">
+  					<div class="col-md-6">
+  						<?php echo "\"" . $post['tweet'] . "\"";?>
+  					</div>
+  			</div>
+  		</div>
+
+  	</div>
 	<?php }?>
 </div>
diff --git a/www/css/styles.css b/www/css/styles.css
index 3dc9e0a..91380c4 100644
--- a/www/css/styles.css
+++ b/www/css/styles.css
@@ -9,6 +9,12 @@ img.home-icon {
     margin-left: 4em;
 }
 
+img.profile-icon {
+    width: 75px;
+    margin-left: 1em;
+    float: left;
+}
+
 .login {
   max-width:45%;
   margin:0 auto;
@@ -54,6 +60,10 @@ img.icon.reg {
   margin-top:0!important
 }
 
+.row {
+  margin-left: 0px;
+}
+
 .handle {
   color: grey;
 }
@@ -66,6 +76,8 @@ img.icon.reg {
 .tweet{
   font-size: 16px;
   font-style: italic;
+  margin-left: 4em;
+  margin-top: -100px;
 }
 
 .footer {
diff --git a/www/img/anon.png b/www/img/anon.png
new file mode 100644
index 0000000..10b9a5a
Binary files /dev/null and b/www/img/anon.png differ
diff --git a/www/img/chris.png b/www/img/chris.png
new file mode 100644
index 0000000..d0169da
Binary files /dev/null and b/www/img/chris.png differ
diff --git a/www/img/mona.png b/www/img/mona.png
new file mode 100644
index 0000000..f9323f9
Binary files /dev/null and b/www/img/mona.png differ