diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
index 8c5af6f..ca0bb4a 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/CameraFragment.java
@@ -161,10 +161,7 @@ public class CameraFragment extends Fragment implements PostUploader.PostUploadL
                 mComment.setText("");
 
                 PostUploader upload = new PostUploader(getActivity());
-                if (R.id.pic_preview == 0) {
-                    upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
-
-                }
+                upload.uploadPicture(new BitmapPost(((PicturePreview)view.findViewById(R.id.pic_preview)).getPicture(), comment));
 
                 mPhoto.recycle();
 
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
index cce0278..e4d92b8 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline.xml
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="Hallo Ik ben een comment!" />
+        android:text="@string/comment_placeholder" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
index f8020e8..202f34e 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/layout/list_item_timeline_profile.xml
@@ -10,24 +10,28 @@
         android:layout_height="250dp" />
 
     <TextView
+        android:gravity="center"
         android:id="@+id/comment_timeline_profile"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Hallo Ik ben een comment!" />
+        android:text="@string/comment_placeholder" />
 
     <LinearLayout
+        android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="40dp">
 
         <TextView
+            android:gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/niet_slecht" />
 
         <TextView
+            android:gravity="center"
             android:id="@+id/niet_slecht_count_profile"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="10" />
+            android:text="   10" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
index 4e7f662..f02108c 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -34,4 +34,5 @@
     <string name="niet_slecht">Niet Slecht.</string>
     <string name="comment">Bijschrift:</string>
     <string name="cancel">Annuleer</string>
+    <string name="comment_placeholder">Hallo Ik ben een comment!</string>
 </resources>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
index 8909894..afa90b1 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/strings.xml
@@ -32,4 +32,6 @@
     <string name="upload_profile_pic">Uploading profile picture…</string>
     <string name="comment">Comment:</string>
     <string name="cancel">Cancel</string>
+    <string name="comment_placeholder">Hello, I am a comment!</string>
+    <string name="mail_success">Er is een e-mail verzonden. Volg a.u.b. de instructies.</string>
 </resources>