diff --git a/README.md b/README.md
index 68272de..82d79f2 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 ## Privacy Friendly App Break Reminder
 
-This application contains the the functionality for a privacy friendly break reminder. It includes basic functionality for a countdowntimer, the possibility to choose different profiles, the chance to make exercises between the breaks. It further includes the typically privacy friendly help and about sites. This app belongs to the group of Privacy Friendly Apps developed by the Technische Universität Darmstadt. 
+This application contains the the functionality for a privacy friendly break reminder. It includes basic functionality for a countdowntimer, the possibility to choose different profiles and the chance to make exercises between the breaks. It further includes the typically privacy friendly help and about sites. This app belongs to the group of Privacy Friendly Apps developed by the Technische Universität Darmstadt. 
 
 ## Motivation
 
-This application has been developed to for the TU Darmstadt module "Usable Security und Usable Privacy". Privacy Friendly Apps are groups of Android applications which are optimized regarding privacy. Further information can be found on secuso.org/pfa
+As it is part of the Privacy Friendly Apps developed by the SECUSO research group of the Technische Universtität Darmstadt in Germany, it is optimized due to user's privacy. Further information can be found on secuso.org/pfa
 
 ## Download and more Information
 
diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AboutActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AboutActivity.java
index 0804583..28f7b17 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AboutActivity.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AboutActivity.java
@@ -3,7 +3,10 @@ package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.text.method.LinkMovementMethod;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
 
 public class AboutActivity extends AppCompatActivity {
 
@@ -11,7 +14,27 @@ public class AboutActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.about);
+
+
+        ActionBar ab = getSupportActionBar();
+        if(ab != null) {
+            ab.setDisplayHomeAsUpEnabled(true);
+        }
+
+        View mainContent = findViewById(R.id.main_content);
+        if (mainContent != null) {
+            mainContent.setAlpha(0);
+            mainContent.animate().alpha(1).setDuration(250);
+        }
+
+        overridePendingTransition(0, 0);
         setupActionBar();
+
+        TextView t1 = (TextView) findViewById(R.id.git);
+        t1.setMovementMethod(LinkMovementMethod.getInstance());
+
+        TextView t2 = (TextView) findViewById(R.id.url);
+        t2.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
     private void setupActionBar() {
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 27964eb..565c3fb 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -110,18 +110,18 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:id="@+id/url"
         android:layout_gravity="center_horizontal"
-        android:autoLink="web"
         android:text="@string/url"
         android:textStyle="bold" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:id="@+id/git"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
         android:textStyle="bold"
-        android:autoLink="web"
         android:text="@string/github" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f3a9bed..6c48e88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -80,8 +80,8 @@
     <string name="about_affiliation">In Affiliation with</string>
     <string name="privacy_friendly">This application belongs to the Privacy Friendly Apps.</string>
     <string name="more_info">More Information can be found here:</string>
-    <string name="github" translatable="false"><a href="https://github.com/SecUSo/privacy-friendly-break-reminder/">Github-Repo</a></string>
-    <string name="url" translatable="false"><a href="https://www.secuso.informatik.tu-darmstadt.de/en/research/results/">https://www.secuso.org</a></string>
+    <string name="github" translatable="false"><a href="https://github.com/SecUSo/privacy-friendly-break-reminder">Github-Repo</a></string>
+    <string name="url" translatable="false"><a href="https://www.secuso.org/pfa">SECUSO-Website</a></string>
 
     <!-- settings for ExerciseTypeActivity -->
     <string name="exercise_summary">Your break will contain exercises for the following body sections:</string>