diff --git a/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java b/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java
index 12b74c8..1071dc9 100644
--- a/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java
+++ b/app/src/main/java/net/headlezz/udacityproject1/MovieDetailsFragment.java
@@ -20,6 +20,7 @@ import net.headlezz.udacityproject1.tmdbapi.TMDBApi;
 public class MovieDetailsFragment extends Fragment {
 
     // TODO make me pretty
+    // TODO not scrolling to the end
 
     public static final String TAG = MovieDetailsFragment.class.getSimpleName();
     public static final String BUNDLE_ARG_MOVIE = "movie";
@@ -69,7 +70,7 @@ public class MovieDetailsFragment extends Fragment {
         tvTitle.setText(mMovie.getTitle());
         tvOverview.setText(mMovie.getOverview());
         String formatedDate = DateUtils.formatDateTime(tvReleaseDate.getContext(), mMovie.getReleaseDate(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_YEAR);
-        tvReleaseDate.setText(formatedDate);
-        tvRating.setText(String.valueOf(mMovie.getAvRating()));
+        tvReleaseDate.setText(getString(R.string.movie_release_date, formatedDate));
+        tvRating.setText(getString(R.string.movie_rating, mMovie.getAvRating()));
     }
 }
diff --git a/app/src/main/res/layout/fragment_movie_details.xml b/app/src/main/res/layout/fragment_movie_details.xml
index 59d5fc1..e79c221 100644
--- a/app/src/main/res/layout/fragment_movie_details.xml
+++ b/app/src/main/res/layout/fragment_movie_details.xml
@@ -27,23 +27,25 @@
             tools:src="@drawable/chappie_ver4" />
 
         <TextView
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             tools:text="2015"
             android:id="@+id/movie_details_tvReleaseDate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16dp"
             android:layout_alignTop="@+id/movie_details_ivPoster"
-            android:layout_alignParentEnd="true" />
+            android:layout_toEndOf="@+id/movie_details_ivPoster" />
 
         <TextView
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             tools:text="5/10"
+            android:layout_marginTop="16dp"
             android:id="@+id/movie_details_tvRating"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/movie_details_tvReleaseDate"
-            android:layout_alignStart="@+id/movie_details_tvReleaseDate"
-            android:layout_marginTop="39dp" />
+            android:layout_alignStart="@+id/movie_details_tvReleaseDate" />
 
         <TextView
             android:id="@+id/movie_details_tvOverview"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad23fb8..0e81335 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">UdacityProject1</string>
     <string name="action_settings">Settings</string>
+    <string name="movie_release_date">Release: %1$s</string>
+    <string name="movie_rating">Rating: %1$s/10</string>
 </resources>