diff --git a/client/src/main/java/org/croudtrip/activities/MainActivity.java b/client/src/main/java/org/croudtrip/activities/MainActivity.java
index 49d3d26..cf77562 100644
--- a/client/src/main/java/org/croudtrip/activities/MainActivity.java
+++ b/client/src/main/java/org/croudtrip/activities/MainActivity.java
@@ -53,13 +53,13 @@ public void init(Bundle savedInstanceState) {
 
 
                         // create sections
-        this.addSection(newSection(getString(R.string.menu_join_trip), R.drawable.ic_settings, new JoinTripFragment()));
-        this.addSection(newSection(getString(R.string.menu_offer_trip), R.drawable.ic_settings, new OfferTripFragment()));
+        this.addSection(newSection(getString(R.string.menu_join_trip), R.drawable.hitchhiker, new JoinTripFragment()));
+        this.addSection(newSection(getString(R.string.menu_offer_trip), R.drawable.ic_directions_car_white, new OfferTripFragment()));
         if(LoginActivity.isUserLoggedIn(this)) {
             // only logged-in users can view their profile
-            this.addSection(newSection(getString(R.string.menu_profile), R.drawable.ic_settings, new ProfileFragment()));
+            this.addSection(newSection(getString(R.string.menu_profile), R.drawable.profile_icon, new ProfileFragment()));
         }
-        this.addSection(newSection(getString(R.string.navigation), R.drawable.ic_settings, new NavigationFragment()));
+        this.addSection(newSection(getString(R.string.navigation), R.drawable.distance, new NavigationFragment()));
 
         ((MaterialSection) getSectionList().get(0)).setNotifications(3);
 
diff --git a/client/src/main/java/org/croudtrip/fragments/JoinTripFragment.java b/client/src/main/java/org/croudtrip/fragments/JoinTripFragment.java
index 664b846..82a5732 100644
--- a/client/src/main/java/org/croudtrip/fragments/JoinTripFragment.java
+++ b/client/src/main/java/org/croudtrip/fragments/JoinTripFragment.java
@@ -14,6 +14,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -37,7 +38,8 @@ public class JoinTripFragment extends Fragment {
 
     private final int REQUEST_PLACE_PICKER = 122;
 
-    private TextView tv_name, tv_address, tv_attributions;
+    private TextView tv_name, tv_attributions;
+    private EditText tv_address;
     private Button btn_destination;
 
     @Override
@@ -55,7 +57,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.fragment_join_trip, container, false);
 
         tv_name = (TextView) view.findViewById(R.id.name);
-        tv_address = (TextView) view.findViewById(R.id.address);
+        tv_address = (EditText) view.findViewById(R.id.address);
         tv_attributions = (TextView) view.findViewById(R.id.attributions);
 
 
diff --git a/client/src/main/java/org/croudtrip/fragments/OfferTripFragment.java b/client/src/main/java/org/croudtrip/fragments/OfferTripFragment.java
index e878ad1..de038a2 100644
--- a/client/src/main/java/org/croudtrip/fragments/OfferTripFragment.java
+++ b/client/src/main/java/org/croudtrip/fragments/OfferTripFragment.java
@@ -14,6 +14,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -39,7 +40,8 @@ public class OfferTripFragment extends Fragment {
 
     private final int REQUEST_PLACE_PICKER = 122;
 
-    private TextView tv_name, tv_address, tv_attributions;
+    private TextView tv_name, tv_attributions;
+    private EditText tv_address;
     private Button btn_destination;
 
     public static OfferTripFragment get() {
@@ -67,7 +69,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.fragment_offer_trip, container, false);
 
         tv_name = (TextView) view.findViewById(R.id.name);
-        tv_address = (TextView) view.findViewById(R.id.address);
+        tv_address = (EditText) view.findViewById(R.id.address);
         tv_attributions = (TextView) view.findViewById(R.id.attributions);
 
 
diff --git a/client/src/main/res/drawable/distance.png b/client/src/main/res/drawable/distance.png
new file mode 100644
index 0000000..943d8e6
Binary files /dev/null and b/client/src/main/res/drawable/distance.png differ
diff --git a/client/src/main/res/drawable/hitchhiker.png b/client/src/main/res/drawable/hitchhiker.png
new file mode 100644
index 0000000..dec3a2d
Binary files /dev/null and b/client/src/main/res/drawable/hitchhiker.png differ
diff --git a/client/src/main/res/drawable/profile_icon.png b/client/src/main/res/drawable/profile_icon.png
new file mode 100644
index 0000000..5c427df
Binary files /dev/null and b/client/src/main/res/drawable/profile_icon.png differ
diff --git a/client/src/main/res/layout/fragment_join_trip.xml b/client/src/main/res/layout/fragment_join_trip.xml
index ac7e410..db16ed9 100644
--- a/client/src/main/res/layout/fragment_join_trip.xml
+++ b/client/src/main/res/layout/fragment_join_trip.xml
@@ -24,19 +24,24 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text"
-            android:id="@+id/name"/>
+            android:id="@+id/name"
+            android:layout_gravity="center_horizontal"/>
 
-        <TextView
+        <EditText
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text"
-            android:id="@+id/address"/>
+            android:id="@+id/address"
+            android:minWidth="200dp"
+            android:hint="Enter address"
+            android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text"
-            android:id="@+id/attributions"/>
+            android:id="@+id/attributions"
+            android:layout_gravity="center_horizontal"/>
 
         <com.rengwuxian.materialedittext.MaterialEditText
             android:id="@+id/waitingTime"
diff --git a/client/src/main/res/layout/fragment_offer_trip.xml b/client/src/main/res/layout/fragment_offer_trip.xml
index 9ecb012..9e70b6c 100644
--- a/client/src/main/res/layout/fragment_offer_trip.xml
+++ b/client/src/main/res/layout/fragment_offer_trip.xml
@@ -22,19 +22,24 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text"
-            android:id="@+id/name"/>
+            android:id="@+id/name"
+            android:layout_gravity="center_horizontal"/>
 
-        <TextView
+        <EditText
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text"
-            android:id="@+id/address"/>
+            android:id="@+id/address"
+            android:minWidth="200dp"
+            android:hint="Enter address"
+            android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text"
-            android:id="@+id/attributions"/>
+            android:id="@+id/attributions"
+            android:layout_gravity="center_horizontal"/>
 
         <com.rengwuxian.materialedittext.MaterialEditText
             android:id="@+id/diversion"