diff --git a/app/src/androidTest/java/com/akdev/nofbeventscraper/MainActivityUnitTest.java b/app/src/androidTest/java/com/akdev/nofbeventscraper/MainActivityUnitTest.java
index f24540e..3b9844f 100644
--- a/app/src/androidTest/java/com/akdev/nofbeventscraper/MainActivityUnitTest.java
+++ b/app/src/androidTest/java/com/akdev/nofbeventscraper/MainActivityUnitTest.java
@@ -36,7 +36,7 @@ public class MainActivityUnitTest {
         mInstrumentation.removeMonitor(monitor);
 
 
-        final String exp = "https://m.facebook.com/events/261145401687844";
+        final String exp = "https://www.facebook.com/events/261145401687844";
 
         String url = "https://www.facebook.com/events/261145401687844";
         String act = mainActivity.checkURI(url);
diff --git a/app/src/androidTest/java/com/akdev/nofbeventscraper/ScraperUnitTest.java b/app/src/androidTest/java/com/akdev/nofbeventscraper/ScraperUnitTest.java
index d1bcd51..06592db 100644
--- a/app/src/androidTest/java/com/akdev/nofbeventscraper/ScraperUnitTest.java
+++ b/app/src/androidTest/java/com/akdev/nofbeventscraper/ScraperUnitTest.java
@@ -55,12 +55,12 @@ public class ScraperUnitTest {
         FbScraper scraper = new FbScraper(null, "");
 
         String in = "foo @[152580919265:274:MagentaMusik 360] bar";
-        String exp = "foo m.facebook.com/152580919265 (MagentaMusik 360) bar";
+        String exp = "foo MagentaMusik 360 [m.facebook.com/152580919265] bar";
         String act = scraper.fixLinks(in);
         assertEquals(exp, act);
 
         in = "foo @[152580919265:274:MagentaMusik 360] bar @[666666666666:274:NoOfTheBeast]";
-        exp = "foo m.facebook.com/152580919265 (MagentaMusik 360) bar m.facebook.com/666666666666 (NoOfTheBeast)";
+        exp = "foo MagentaMusik 360 [m.facebook.com/152580919265] bar NoOfTheBeast [m.facebook.com/666666666666]";
         act = scraper.fixLinks(in);
         assertEquals(exp, act);
 
diff --git a/app/src/main/java/com/akdev/nofbeventscraper/FbScraper.java b/app/src/main/java/com/akdev/nofbeventscraper/FbScraper.java
index 69219da..4bee8ca 100644
--- a/app/src/main/java/com/akdev/nofbeventscraper/FbScraper.java
+++ b/app/src/main/java/com/akdev/nofbeventscraper/FbScraper.java
@@ -80,7 +80,8 @@ public class FbScraper extends AsyncTask<Void, Void, Void> {
     protected String fixLinks(String description_in) {
         try {
             // @[152580919265:274:MagentaMusik 360] -> m.facebook.com/152580919265
-            return description_in.replaceAll("@\\[([0-9]{10,}):[0-9]{3}:([^\\]]*)\\]", "m.facebook.com/$1 ($2)");
+            return description_in.replaceAll("@\\[([0-9]{10,}):[0-9]{3}:([^\\]]*)\\]",
+                    "$2 [m.facebook.com/$1]");
 
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
index 12177fa..111b69d 100644
--- a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
+++ b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
@@ -21,13 +21,9 @@ import android.widget.Toast;
 
 import com.squareup.picasso.Picasso;
 
-import java.net.URI;
 import java.net.URL;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.TimeZone;
 
 
 public class MainActivity extends AppCompatActivity {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2d5c063..1a3d03c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -82,8 +82,9 @@
                 android:id="@+id/cancel_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="8dp"
+                android:textColor="#FFFFFF"
                 android:layout_weight="1"
                 android:padding="12dp"
                 android:text="@android:string/cancel"
@@ -93,8 +94,9 @@
                 android:id="@+id/ok_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="16dp"
+                android:textColor="#FFFFFF"
                 android:layout_weight="1"
                 android:padding="12dp"
                 android:text="@android:string/ok"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 82aed49..48cc879 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#297DA6</color>
     <color name="colorPrimaryDark">#23607E</color>
-    <color name="colorAccent">#23607E</color>
+    <color name="colorAccent">#297DA6</color>
 </resources>