diff --git a/Assignments/CrimeActivity/app/src/main/java/com/calebfontenot/crimeactivity/CrimeFragment.java b/Assignments/CrimeActivity/app/src/main/java/com/calebfontenot/crimeactivity/CrimeFragment.java
index 60d15ca..24928a9 100644
--- a/Assignments/CrimeActivity/app/src/main/java/com/calebfontenot/crimeactivity/CrimeFragment.java
+++ b/Assignments/CrimeActivity/app/src/main/java/com/calebfontenot/crimeactivity/CrimeFragment.java
@@ -33,7 +33,7 @@ public class CrimeFragment extends Fragment {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.activity_main, container, false);
+        View v = inflater.inflate(R.layout.fragment_crime, container, false);
 
         mSolvedCheckBox = (CheckBox) v.findViewById(R.id.crime_solved);
         mTitleField = (EditText) v.findViewById(R.id.crime_title);
@@ -64,6 +64,6 @@ public class CrimeFragment extends Fragment {
         mDateButton = (Button) v.findViewById(R.id.crime_date);
         mDateButton.setText(mCrime.getmDate().toString());
         mDateButton.setEnabled(false);
-        return super.onCreateView(inflater, container, savedInstanceState);
+        return v;//super.onCreateView(inflater, container, savedInstanceState);
     }
 }
diff --git a/Assignments/CrimeActivity/app/src/main/res/layout/activity_main.xml b/Assignments/CrimeActivity/app/src/main/res/layout/activity_main.xml
index 077ddc0..0d21f1d 100644
--- a/Assignments/CrimeActivity/app/src/main/res/layout/activity_main.xml
+++ b/Assignments/CrimeActivity/app/src/main/res/layout/activity_main.xml
@@ -1,38 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="16dp"
-    android:orientation="vertical">
-    <!--style="?android:listSeperatorTextViewStyle"-->
-    <TextView
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/crime_title_label"/>
-
-    <EditText
-        android:id="@+id/crime_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/crime_title_hint" />
-
-    <!--style="?android:listSeperatorTextViewStyle"-->
-    <TextView
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/crime_details_label"
-        />
-    <Button
-        android:id="@+id/crime_date"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-    <CheckBox
-        android:id="@+id/crime_solved"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/crime_solved_label"/>
-
-</LinearLayout>
\ No newline at end of file
+    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/Assignments/CrimeActivity/app/src/main/res/layout/fragment_crime.xml b/Assignments/CrimeActivity/app/src/main/res/layout/fragment_crime.xml
new file mode 100644
index 0000000..c2b57bf
--- /dev/null
+++ b/Assignments/CrimeActivity/app/src/main/res/layout/fragment_crime.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_container"
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+android:layout_margin="16dp"
+android:orientation="vertical">
+<!--style="?android:listSeperatorTextViewStyle"-->
+<TextView
+    style="+?android:listSeperatorTextViewStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:text="@string/crime_title_label"/>
+
+<EditText
+    android:id="@+id/crime_title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/crime_title_hint" />
+
+<!--style="?android:listSeperatorTextViewStyle"-->
+
+    <TextView
+    style="+?android:listSeperatorTextViewStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:text="@string/crime_details_label"
+    />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/crime_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <CheckBox
+            android:id="@+id/crime_solved"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/crime_solved_label" />
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file