diff --git a/app/app.iml b/app/app.iml
index 7582c3b..d7767e3 100755
--- a/app/app.iml
+++ b/app/app.iml
@@ -67,6 +67,7 @@
     <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
     <orderEntry type="library" exported="" name="jaxen-1.1.6" level="project" />
     <orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
   </component>
 </module>
 
diff --git a/app/src/main/assets/www/about.html b/app/src/main/assets/www/about.html
index e2f597e..640193a 100755
--- a/app/src/main/assets/www/about.html
+++ b/app/src/main/assets/www/about.html
@@ -11,7 +11,6 @@
         <li>GraphView (<a href="http://android-graphview.org/">http://android-graphview.org/</a>)</li>
         <li>SweetiePlus Icons (<a href="http://sublink.ca/">http://sublink.ca/</a>)</li>
         <li>DynamicListView (<a href="https://android.googlesource.com">https://android.googlesource.com</a>)</li>
-        <li>Icons8 <a href="http://icons8.com/android-icons">http://Icons8.com</a></li>
         <li>Android-logging-log4j (<a href="https://code.google.com/p/android-logging-log4j/">https://code.google.com/p/android-logging-log4j/</a>)</li>
         <li>Log4j (<a href="http://logging.apache.org/log4j">http://logging.apache.org/log4j</a>)</li>
         <li>dom4J (<a href="http://dom4j.sourceforge.net/">http://dom4j.sourceforge.net/</a>)</li>
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
index c2d0333..19dff82 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
@@ -9,10 +9,14 @@ import org.apache.log4j.Logger;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
+import java.io.Writer;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,7 +26,7 @@ import java.util.List;
 public class UeControlExecutor implements Runnable, UeBehaviour.DataHandledListener {
     private static final Logger log = Logger.getLogger(UeControlExecutor.class);
 
-    private List<UeBehaviour> behaviours;
+    private ArrayList<UeBehaviour> behaviours;
     private UeBehaviour currentlyActive;
     private boolean terminate;
     private Thread thread;
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java b/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java
index ef5d1de..e0a2130 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java
@@ -71,8 +71,8 @@ public class CSVWriter {
         StringBuilder line = new StringBuilder();
         line.append(getTime()).append(DELIMITER);
         line.append(behaviour).append(DELIMITER);
-        line.append(down).append(DELIMITER);
-        line.append(up).append(DELIMITER);
+        line.append((long)down).append(DELIMITER);
+        line.append((long)up).append(DELIMITER);
         line.append(getRat()).append(DELIMITER);
         line.append(getCellIds()).append(DELIMITER);
         line.append(getSSID()).append(DELIMITER);
@@ -135,9 +135,18 @@ public class CSVWriter {
             StringBuilder data = new StringBuilder();
 
             GsmCellLocation location = (GsmCellLocation) telMan.getCellLocation();
-            if(location != null)
-                return ""+location.getCid();
-
+            if(location != null) {
+                switch(telMan.getNetworkType()){
+                    case TelephonyManager.NETWORK_TYPE_UMTS:
+                    case TelephonyManager.NETWORK_TYPE_HSPA:
+                    case TelephonyManager.NETWORK_TYPE_HSDPA:
+                    case TelephonyManager.NETWORK_TYPE_HSUPA:
+                    case TelephonyManager.NETWORK_TYPE_HSPAP:
+                        return ""+(location.getCid() & 0xFFFF);
+                    default:
+                        return ""+location.getCid();
+                }
+            }
             /*List<NeighboringCellInfo> cellList = telMan.getNeighboringCellInfo();
             if(cellList != null) {
                 for (int i = 0; i < cellList.size(); i++) {
diff --git a/app/src/main/res/drawable-hdpi/ic_action.png b/app/src/main/res/drawable-hdpi/ic_action.png
deleted file mode 100644
index b384450..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action.png b/app/src/main/res/drawable-mdpi/ic_action.png
deleted file mode 100644
index 6727ca7..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action.png b/app/src/main/res/drawable-xhdpi/ic_action.png
deleted file mode 100644
index 0477cc3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action.png b/app/src/main/res/drawable-xxhdpi/ic_action.png
deleted file mode 100644
index 834fd27..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action.png and /dev/null differ