diff --git a/app/src/main/java/com/ireallydontcare/viet/posseidon/MainActivity.java b/app/src/main/java/com/ireallydontcare/viet/posseidon/MainActivity.java
index 72e24943c5cb41190b8b77689a5d453e6a7ee579..cf550701735cc21daf9e3a8024e20bee44bff31a 100644
--- a/app/src/main/java/com/ireallydontcare/viet/posseidon/MainActivity.java
+++ b/app/src/main/java/com/ireallydontcare/viet/posseidon/MainActivity.java
@@ -124,7 +124,10 @@ public class MainActivity extends AppCompatActivity
 
             @Override
             protected List<Subject> doInBackground(Void... voids) {
-                return database.SubjectDao().getAll();
+                List<Subject> subjects = database.SubjectDao().getAll();
+                subjectAdapter.update(subjects);
+                return subjects;
+
             }
 
             @Override
@@ -134,4 +137,5 @@ public class MainActivity extends AppCompatActivity
         }.execute();
     }
 
+
 }
diff --git a/app/src/main/java/com/ireallydontcare/viet/posseidon/SubjectActivity.java b/app/src/main/java/com/ireallydontcare/viet/posseidon/SubjectActivity.java
index 385482f6cc371968d72d0333b2ee8c2202b2c6de..7efda5d59be82a2b8928948cec36463f255b23dc 100644
--- a/app/src/main/java/com/ireallydontcare/viet/posseidon/SubjectActivity.java
+++ b/app/src/main/java/com/ireallydontcare/viet/posseidon/SubjectActivity.java
@@ -23,7 +23,7 @@ public class SubjectActivity extends AppCompatActivity
     implements NewDialogEventFragment.NewEventDialogListener {
 
 
-    public static final String SUBJECT_OBJECT_ID = "SUBJECT.ID";
+    public static final String SUBJECT_ID = "SUBJECT.ID";
 
     public Long subjectId;
     private RecyclerView eventRecyclerView;
@@ -34,7 +34,7 @@ public class SubjectActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subject);
-        subjectId = getIntent().getExtras().getLong("SUBJECT_OBJECT_ID");
+        subjectId = getIntent().getExtras().getLong(SUBJECT_ID);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
diff --git a/app/src/main/java/com/ireallydontcare/viet/posseidon/adapter/EventAdapter.java b/app/src/main/java/com/ireallydontcare/viet/posseidon/adapter/EventAdapter.java
index 7c4a5df41ff9c0c9fa8ad9a4ff9240134991fa81..f6adef2cb89dbb83cbc81fb7f23977b7bcfbf584 100644
--- a/app/src/main/java/com/ireallydontcare/viet/posseidon/adapter/EventAdapter.java
+++ b/app/src/main/java/com/ireallydontcare/viet/posseidon/adapter/EventAdapter.java
@@ -5,6 +5,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.ireallydontcare.viet.posseidon.R;
 import com.ireallydontcare.viet.posseidon.model.Event;
@@ -24,7 +25,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventViewHol
         // create a new view
         View itemView = LayoutInflater
                 .from(parent.getContext())
-                .inflate(R.layout.item_subject, parent, false);
+                .inflate(R.layout.item_event, parent, false);
 
         EventViewHolder vh = new EventViewHolder(itemView);
         return vh;
@@ -35,15 +36,23 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventViewHol
         // - get element from your dataset at this position
         // - replace the contents of the view with that element
         final Event event = events.get(position);
+        holder.name.setText(event.type);
+        holder.code.setText(event.SubjectId.toString());
         holder.event = event;
     }
 
     public class EventViewHolder extends RecyclerView.ViewHolder {
         Event event;
 
+        TextView name;
+        TextView code;
+
         public EventViewHolder(View itemView) {
             super(itemView);
 
+            name = itemView.findViewById(R.id.subject_name);
+            code = itemView.findViewById(R.id.subject_code);
+
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89a0ed62855632419de1e274ccee4eb5587b8b62
--- /dev/null
+++ b/app/src/main/res/layout/item_event.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp">
+
+    <TextView
+        android:layout_marginLeft="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/subject_name"
+        android:text="ELETEM LEGFOSABB TARGYA"
+        android:paddingRight="10px"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/subject_code"
+        android:text="BATMAN NEPTUN KOD"/>
+
+</LinearLayout>
\ No newline at end of file