diff --git a/.idea/libraries/GraphView_3_1_2.xml b/.idea/libraries/GraphView_3_1_2.xml
index 78349eb..970f273 100755
--- a/.idea/libraries/GraphView_3_1_2.xml
+++ b/.idea/libraries/GraphView_3_1_2.xml
@@ -4,8 +4,6 @@
       <root url="jar://$PROJECT_DIR$/app/libs/GraphView-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/app/libs/GraphView-master.zip!/GraphView-master/src/main/java" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 1cd81a5..a57197e 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,7 @@ android {
         release {
             runProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            zipAlign true
         }
     }
 }
diff --git a/app/src/main/assets/www/about.html b/app/src/main/assets/www/about.html
index a9bae57..8465f35 100755
--- a/app/src/main/assets/www/about.html
+++ b/app/src/main/assets/www/about.html
@@ -9,6 +9,7 @@
         <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>App icon by <a href="http://icons8.com/android-icons">Icons8.com</a></li>
     </ul>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
index ac07309..c783f16 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java
@@ -29,10 +29,6 @@ public class MainActivity extends FragmentActivity
     private NavigationDrawerFragment navigationDrawerFragment;
     private StatusFragment statusFragment;
 
-    /**
-     * Used to store the last screen title. For use in {@link #restoreActionBar()}.
-     */
-    private CharSequence title;
     private int currentExecutor;
 
     private static ArrayList<UeControlExecutor> executors;
@@ -46,7 +42,6 @@ public class MainActivity extends FragmentActivity
                 getFragmentManager().findFragmentById(R.id.navigation_drawer);
         statusFragment = (StatusFragment)
                 getFragmentManager().findFragmentById(R.id.status_fragment);
-        title = getTitle();
 
         // Set up the drawer.
         navigationDrawerFragment.setUp(
@@ -73,42 +68,24 @@ public class MainActivity extends FragmentActivity
         currentExecutor = position;
     }
 
-    public void onSectionAttached(int number) {
-        currentExecutor = number;
-        switch (number) {
-            case 1:
-                title = getString(R.string.title_section1);
-                break;
-            case 2:
-                title = getString(R.string.title_section2);
-                break;
-            case 3:
-                title = getString(R.string.title_section3);
-                break;
-        }
-    }
-
-    public void restoreActionBar() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-        actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setTitle(title);
-    }
-
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (!navigationDrawerFragment.isDrawerOpen()) {
+        if (navigationDrawerFragment != null && !navigationDrawerFragment.isDrawerOpen()) {
             // Only show items in the action bar relevant to this screen
             // if the drawer is not showing. Otherwise, let the drawer
             // decide what to show in the action bar.
             getMenuInflater().inflate(R.menu.main, menu);
-            restoreActionBar();
+
+            ActionBar actionBar = getActionBar();
+            actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+            actionBar.setDisplayShowTitleEnabled(true);
+
             return true;
         }
         return super.onCreateOptionsMenu(menu);
     }
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // Handle action bar item clicks here. The action bar will
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/fragments/ConfigureDialog.java b/app/src/main/java/com/ericsson/uecontrol/gui/fragments/ConfigureDialog.java
index bef497c..19e3f42 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/fragments/ConfigureDialog.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/fragments/ConfigureDialog.java
@@ -47,7 +47,7 @@ public class ConfigureDialog extends DialogFragment {
                     LinearLayout.LayoutParams.MATCH_PARENT));
 
             TextView label = new TextView(getActivity());
-            label.setText(confParam.getName()+": ");
+            label.setText(confParam.getNiceName()+": ");
             label.setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT));
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java b/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
index 1d65e5e..c965658 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/util/Configurator.java
@@ -91,7 +91,7 @@ public class Configurator {
         public String getNiceName(){return niceName;}
         public ConfigType getType(){return type;}
 
-        public String getString(){return (String)  value;}
+        public String getString(){return value.toString();}
 
         public void setString(String v){
             switch(type){
diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_list.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_item_list.xml
rename to app/src/main/res/layout/fragment_list.xml
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
index 4b596c9..f351911 100755
--- a/app/src/main/res/values/refs.xml
+++ b/app/src/main/res/values/refs.xml
@@ -7,6 +7,6 @@
     For more on layout aliases, see:
     http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters
     -->
-    <item name="fragment_item" type="layout">@layout/fragment_item_list</item>
+    <item name="fragment_item" type="layout">@layout/fragment_list</item>
 
 </resources>
\ No newline at end of file