diff --git a/www/application/controllers/Login.php b/www/application/controllers/Login.php
index 260b5b0..c2c9ba9 100644
--- a/www/application/controllers/Login.php
+++ b/www/application/controllers/Login.php
@@ -1,4 +1,5 @@
 <?php
+ini_set('error_reporting', ~E_NOTICE);
 
 class Login extends CI_Controller {
   function __Construct(){
@@ -6,7 +7,6 @@ function __Construct(){
       $this->load->database(); // load database
       $this->load->model('User_Info_Model'); // load model
       session_start();
-      $this->output->enable_profiler(TRUE);
   }
 
   public function index(){
diff --git a/www/application/controllers/User_Tweets.php b/www/application/controllers/User_Tweets.php
index 29eff36..168f379 100644
--- a/www/application/controllers/User_Tweets.php
+++ b/www/application/controllers/User_Tweets.php
@@ -7,7 +7,6 @@ function __Construct(){
       parent::__Construct();
       $this->load->database(); // load database
       $this->load->model('User_Tweets_Model'); // load model
-      //$this->output->enable_profiler(TRUE);
   }
 
  public function index() {
diff --git a/www/application/models/User_Tweets_Model.php b/www/application/models/User_Tweets_Model.php
index 9f62452..a998660 100644
--- a/www/application/models/User_Tweets_Model.php
+++ b/www/application/models/User_Tweets_Model.php
@@ -17,7 +17,7 @@ function addTweet(){
       $this->load->helper('url');
       $data = array(
           'tweet' => $this->input->post('tweet'),
-          'user_id' => 2 // UPDATE THIS WITH SESSION DATA
+          'user_id' => $this->session->userdata('id') // UPDATE THIS WITH SESSION DATA
       );
 
       return $this->db->insert('Tweets', $data);
diff --git a/www/application/views/login.php b/www/application/views/login.php
index cbfd9cd..da6ddee 100644
--- a/www/application/views/login.php
+++ b/www/application/views/login.php
@@ -1,13 +1,6 @@
 <?php
   $this->load->library('form_validation');
-<<<<<<< HEAD
-  echo validation_errors();
-  echo form_open('login'); ?>
-  <?php
-        var_dump($username);        //var_dump($sesh);
-=======
   echo form_open('login');
->>>>>>> a024e265e94e8addb4b7953ae90dbdb94e25e7af
   ?>
   <div class="login container">
     <img class="icon" src="../img/twitter.png" alt="Twitter">
diff --git a/www/application/views/user.php b/www/application/views/user.php
index 92c30e9..0b613a3 100644
--- a/www/application/views/user.php
+++ b/www/application/views/user.php
@@ -3,14 +3,22 @@
   <h1>My Tweets</h1>
 
   <?php $this->load->library('form_validation'); ?>
-  <?php echo form_open('user_tweets/create'); ?>
 
-    <div class="form-group">
-      <textarea class="form-control" rows="3" name="tweet" value="<?php echo set_value('tweet'); ?>" placeholder="What's on your mind?"></textarea>
-      <?php echo form_error('tweet'); ?>
+  <div class="row">
+    <div class="col-md-4 user-content">
+      <?php echo "<h3>" . $this->session->userdata('first_name') . " " . $this->session->userdata('last_name') . "</h3>"; ?>
     </div>
-    <button class="btn btn-primary" type="submit">Tweet</button>
-  </form>
+    <div class="col-md-8">
+      <?php echo form_open('user_tweets/create'); ?>
+
+        <div class="form-group">
+          <textarea class="form-control" rows="3" name="tweet" value="<?php echo set_value('tweet'); ?>" placeholder="What's on your mind?"></textarea>
+          <?php echo form_error('tweet'); ?>
+        </div>
+        <button class="btn btn-primary" type="submit">Tweet</button>
+      </form>
+    </div>
+  </div>
 
   <?php foreach($posts as $post){ ?>
 	<div class="tweet-container">
diff --git a/www/css/styles.css b/www/css/styles.css
index 8c78b30..3dc9e0a 100644
--- a/www/css/styles.css
+++ b/www/css/styles.css
@@ -34,8 +34,14 @@ img.icon.reg {
   margin:0 auto;
 }
 
-.tweet-container{
+.user-content{
+  background-color:#ffffff;
+  border-radius: 50px;
   border:1px solid #eeeeee;
+}
+
+.tweet-container{
+
   margin-bottom:15px;
   margin-top: 15px;
   max-width:100%;