diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 57f6745..761131f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,17 +25,28 @@
 			/>
 
 		<activity
-			android:name=".app.ui.HomeActivity"
+			android:name=".app.home.HomeActivity"
 			android:label="@string/app_name"
 			android:theme="@style/Snorlax.Activity"
 			>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
-
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
 
+		<activity
+			android:name=".app.rename.RenameActivity"
+			android:label="@string/format"
+			android:parentActivityName=".app.home.HomeActivity"
+			android:theme="@style/Snorlax.Activity"
+			>
+			<intent-filter>
+				<action android:name=".app.rename.RenameActivity"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+			</intent-filter>
+		</activity>
+
 	</application>
 
 </manifest>
diff --git a/app/src/main/java/com/icecream/snorlax/app/ui/HomeActivity.java b/app/src/main/java/com/icecream/snorlax/app/home/HomeActivity.java
similarity index 97%
rename from app/src/main/java/com/icecream/snorlax/app/ui/HomeActivity.java
rename to app/src/main/java/com/icecream/snorlax/app/home/HomeActivity.java
index 9883f23..c8c2a2e 100644
--- a/app/src/main/java/com/icecream/snorlax/app/ui/HomeActivity.java
+++ b/app/src/main/java/com/icecream/snorlax/app/home/HomeActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.icecream.snorlax.app.ui;
+package com.icecream.snorlax.app.home;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -63,15 +63,15 @@ public class HomeActivity extends AppCompatActivity {
 	private AlertDialog mAboutDialog;
 
 	@Override
-	protected void onCreate(Bundle savedStateInstanceState) {
-		super.onCreate(savedStateInstanceState);
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
 		setContentView(R.layout.home_activity);
 		mUnbinder = ButterKnife.bind(this);
 
 		setupToolbar();
 		setupPreferences();
 
-		if (savedStateInstanceState == null) {
+		if (savedInstanceState == null) {
 			Observable
 				.just(SnorlaxApp.isEnabled())
 				.filter(enabled -> !enabled)
diff --git a/app/src/main/java/com/icecream/snorlax/app/rename/RenameActivity.java b/app/src/main/java/com/icecream/snorlax/app/rename/RenameActivity.java
new file mode 100644
index 0000000..92325c0
--- /dev/null
+++ b/app/src/main/java/com/icecream/snorlax/app/rename/RenameActivity.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016. Pedro Diaz <igoticecream@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.icecream.snorlax.app.rename;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+
+import com.icecream.snorlax.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+@SuppressWarnings({"unused", "WeakerAccess", "FieldCanBeLocal"})
+public class RenameActivity extends AppCompatActivity {
+
+	@BindView(R.id.toolbar)
+	Toolbar mToolbar;
+
+	private Unbinder mUnbinder;
+
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.rename_activity);
+		mUnbinder = ButterKnife.bind(this);
+
+		setupToolbar();
+	}
+
+	private void setupToolbar() {
+		setSupportActionBar(mToolbar);
+
+		if (getSupportActionBar() != null) {
+			getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		}
+	}
+}
diff --git a/app/src/main/res/layout/home_activity.xml b/app/src/main/res/layout/home_activity.xml
index fa82a63..3159b27 100644
--- a/app/src/main/res/layout/home_activity.xml
+++ b/app/src/main/res/layout/home_activity.xml
@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:fitsSystemWindows="true"
-	tools:context=".app.ui.HomeActivity"
+	tools:context=".app.home.HomeActivity"
 	>
 
 	<android.support.design.widget.CoordinatorLayout
@@ -19,7 +19,10 @@
 		<android.support.design.widget.AppBarLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:elevation="@dimen/evelation_toolbar"
+			android:stateListAnimator="@null"
 			android:theme="@style/Snorlax.AppBarOverlay"
+			tools:ignore="UnusedAttribute"
 			>
 
 			<android.support.v7.widget.Toolbar
diff --git a/app/src/main/res/layout/rename_activity.xml b/app/src/main/res/layout/rename_activity.xml
new file mode 100644
index 0000000..37b49c5
--- /dev/null
+++ b/app/src/main/res/layout/rename_activity.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<android.support.design.widget.CoordinatorLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
+	tools:context=".app.home.HomeActivity"
+	>
+
+	<android.support.design.widget.CoordinatorLayout
+		android:id="@+id/coordinator"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:fitsSystemWindows="false"
+		>
+
+		<android.support.design.widget.AppBarLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:elevation="@dimen/evelation_toolbar"
+			android:stateListAnimator="@null"
+			android:theme="@style/Snorlax.AppBarOverlay"
+			tools:ignore="UnusedAttribute"
+			>
+
+			<android.support.v7.widget.Toolbar
+				android:id="@+id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				android:background="?attr/colorPrimary"
+				app:popupTheme="@style/Snorlax.PopupOverlay"
+				/>
+
+		</android.support.design.widget.AppBarLayout>
+
+
+		<FrameLayout
+			android:id="@+id/content"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:layout_behavior="@string/appbar_scrolling_view_behavior"
+			/>
+
+	</android.support.design.widget.CoordinatorLayout>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml
index 7df3891..c9325b5 100644
--- a/app/src/main/res/menu/menu_home.xml
+++ b/app/src/main/res/menu/menu_home.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	tools:context=".app.ui.HomeActivity"
+	tools:context=".app.home.HomeActivity"
 	>
 
 	<item
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c064e7d..3837de1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
 	<dimen name="margin_fab">16dp</dimen>
 
 	<!-- Elevation -->
+	<dimen name="evelation_toolbar">4dp</dimen>
 	<dimen name="evelation_normal_fab">6dp</dimen>
 	<dimen name="evelation_pressed_fab">12dp</dimen>
 	<dimen name="margin_vertical_dialog">16dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd6a834..03771b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 
 	<string name="about">About</string>
 	<string name="enable">Enable</string>
+	<string name="format">Format</string>
 
 	<string name="about_version">Version %1$s</string>
 	<string name="about_author">By igoticecream (igoticecream@gmail.com)</string>
@@ -44,6 +45,10 @@
 	<string name="preference_rename_enable_title">Enable inventory pokemons stats</string>
 	<string name="preference_rename_enable_summary">Show inventory pokemons stats on ingame pokemon list</string>
 
+	<string name="preference_rename_activity_enable_key">rename_activity_key</string>
+	<string name="preference_rename_activity_enable_title">Format</string>
+	<string name="preference_rename_activity_enable_summary">Customize how the stats are going to be displayed on pokemons names</string>
+
 	<string name="preference_catch_notification">Catch Notifications</string>
 	<string name="preference_catch_notification_enable_key">catch_notification_key</string>
 	<string name="preference_catch_notification_enable_title">Enable catch notifications</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index a63d2ae..12d6ea5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -27,6 +27,17 @@
 			android:title="@string/preference_rename_enable_title"
 			/>
 
+		<Preference
+			android:key="@string/preference_rename_activity_enable_key"
+			android:summary="@string/preference_rename_activity_enable_summary"
+			android:title="@string/preference_rename_activity_enable_title"
+			>
+			<intent
+				android:action=".app.rename.RenameActivity"
+				/>
+
+		</Preference>
+
 	</PreferenceCategory>
 
 	<PreferenceCategory