diff --git a/wp-app-kit/app/core/app.js b/wp-app-kit/app/core/app.js
index 9317fd0..7d9c09a 100644
--- a/wp-app-kit/app/core/app.js
+++ b/wp-app-kit/app/core/app.js
@@ -919,7 +919,7 @@ define(function (require) {
       };
 	  
 	//--------------------------------------------------------------------------
-	//Network : handle network state if the Network phonegap plugin is available
+	//Network : handle network state if the Network PhoneGap plugin is available
 
 	app.onOnline = function(){
 		vent.trigger('network:online');
diff --git a/wp-app-kit/app/lang/theme-messages.js b/wp-app-kit/app/lang/theme-messages.js
index b49e8a6..992233b 100644
--- a/wp-app-kit/app/lang/theme-messages.js
+++ b/wp-app-kit/app/lang/theme-messages.js
@@ -7,7 +7,7 @@ define( function ( require ) {
 
 	return {
 		error_remote_connexion_failed : 'Remote connection to website failed',
-		error_occured_undefined : 'Oops, an error occured...',
+		error_occured_undefined : 'Oops, an error occurred...',
 		info_no_content : "The application couldn't retrieve any content, please check your internet connection!",
 		info_network_online : "Internet connection ok",
 		info_network_offline : "Internet connection lost",
diff --git a/wp-app-kit/app/themes/bootstrap/layout.html b/wp-app-kit/app/themes/bootstrap/layout.html
index c1fa6fc..c60bde8 100644
--- a/wp-app-kit/app/themes/bootstrap/layout.html
+++ b/wp-app-kit/app/themes/bootstrap/layout.html
@@ -9,7 +9,7 @@
 		    </button>
 		    <span class="navbar-brand refresh-button-wrapper">
 		     	<a href="#" id="refresh-button" class="navbar-brand"><span class="glyphicon glyphicon-refresh"></span></a>
-		     	<a href="#" id="go-back" class="navbar-brand" style="display:none"><span class="glyphicon glyphicon-backward"></span></a>
+		     	<a href="#" id="go-back" class="navbar-brand" style="display:none"><span class="glyphicon glyphicon-chevron-left"></span></a>
 		    </span>
 		    <span class="navbar-brand"><a href="#"><%= app_title %></a></span>
 		</div>
diff --git a/wp-app-kit/lang/wp-app-kit-fr_FR.po b/wp-app-kit/lang/wp-app-kit-fr_FR.po
index 08a3255..1fb9ec5 100644
--- a/wp-app-kit/lang/wp-app-kit-fr_FR.po
+++ b/wp-app-kit/lang/wp-app-kit-fr_FR.po
@@ -139,7 +139,7 @@ msgstr "Email de l'auteur"
 
 # @ wp-app-kit
 #: ../lib/apps/apps.php:164
-msgid "Phonegap plugins"
+msgid "Phonegap Plugins"
 msgstr "Plugins Phonegap"
 
 # @ wp-app-kit
@@ -929,7 +929,7 @@ msgid "Application title (displayed in app top bar)"
 msgstr "Titre de l'application (affiché dans la top bar)"
 
 #: ../lib/themes/upload-themes.php:18
-msgid "Upload themes"
+msgid "Upload Themes"
 msgstr "Télécharger des thèmes"
 
 #: ../lib/themes/upload-themes.php:26
diff --git a/wp-app-kit/lang/wp-app-kit-fr_FR.pot b/wp-app-kit/lang/wp-app-kit-fr_FR.pot
index 6460d18..f2d4d9d 100644
--- a/wp-app-kit/lang/wp-app-kit-fr_FR.pot
+++ b/wp-app-kit/lang/wp-app-kit-fr_FR.pot
@@ -83,7 +83,7 @@ msgstr ""
 #: ../lib/apps/apps.php:131
 msgid ""
 "PhoneGap config.xml informations that are going to be displayed on App "
-"Stores.<br/>They are required when exporting the App to Phonegap, but are "
+"Stores.<br/>They are required when exporting the App to PhoneGap, but are "
 "not used for App debug and simulation in browsers."
 msgstr ""
 
@@ -114,7 +114,7 @@ msgstr ""
 
 # @ wp-app-kit
 #: ../lib/apps/apps.php:148
-msgid "Phonegap version"
+msgid "PhoneGap version"
 msgstr ""
 
 # @ wp-app-kit
@@ -134,14 +134,14 @@ msgstr ""
 
 # @ wp-app-kit
 #: ../lib/apps/apps.php:160
-msgid "Phonegap plugins"
+msgid "PhoneGap plugins"
 msgstr ""
 
 # @ wp-app-kit
 #: ../lib/apps/apps.php:162
 msgid ""
-"Write the phonegap plugins tags as defined in the PhoneGap documentation.<br/"
-">Example : to include the \"In App Browser\" plugin for a Phonegap Build "
+"Write the PhoneGap plugins tags as defined in the PhoneGap documentation.<br/"
+">Example : to include the \"In App Browser\" plugin for a PhoneGap Build "
 "compilation, enter &lt;gap:plugin name=\"org.apache.cordova.inappbrowser\" "
 "version=\"0.3.3\" /&gt; directly in the textarea."
 msgstr ""
@@ -212,7 +212,7 @@ msgstr ""
 
 # @ wp-app-kit
 #: ../lib/apps/build.php:28
-msgid "Phonegap ready App export"
+msgid "PhoneGap ready App export"
 msgstr ""
 
 # @ wp-app-kit
@@ -270,7 +270,7 @@ msgstr ""
 # @ wp-app-kit
 #: ../lib/apps/build.php:72
 msgid ""
-"Phonegap exports are Zip files created in the WordPress uploads directory"
+"PhoneGap exports are Zip files created in the WordPress uploads directory"
 msgstr ""
 
 # @ wp-app-kit
diff --git a/wp-app-kit/lib/apps/apps.php b/wp-app-kit/lib/apps/apps.php
index 4bcbe3e..5c08b2d 100644
--- a/wp-app-kit/lib/apps/apps.php
+++ b/wp-app-kit/lib/apps/apps.php
@@ -44,7 +44,7 @@ public static function apps_custom_post_type() {
 					'add_new' => __( 'Add', WpAppKit::i18n_domain ),
 					'add_new_item' => __( 'Add an application', WpAppKit::i18n_domain ),
 					'edit' => __( 'Edit', WpAppKit::i18n_domain ),
-					'edit_item' => __( 'Edit application', WpAppKit::i18n_domain ),
+					'edit_item' => __( 'Edit Application', WpAppKit::i18n_domain ),
 					'new_item' => __( 'New application', WpAppKit::i18n_domain ),
 					'not_found' => __( 'No application found', WpAppKit::i18n_domain ),
 				)
@@ -91,7 +91,7 @@ public static function add_phonegap_meta_box() {
 
 		add_meta_box(
 			'wpak_app_phonegap_data',
-			__( 'Phonegap config.xml data', WpAppKit::i18n_domain ),
+			__( 'PhoneGap config.xml Data', WpAppKit::i18n_domain ),
 			array( __CLASS__, 'inner_phonegap_infos_box' ),
 			'wpak_apps',
 			'normal',
@@ -132,7 +132,7 @@ public static function inner_phonegap_infos_box( $post, $current_box ) {
 		$main_infos = self::get_app_main_infos( $post->ID );
 		?>
 		<div class="wpak_settings">
-			<span class="description"><?php _e( 'PhoneGap config.xml informations that are going to be displayed on App Stores.<br/>They are required when exporting the App to Phonegap, but are not used for App debug and simulation in browsers.', WpAppKit::i18n_domain ) ?></span>
+			<span class="description"><?php _e( 'PhoneGap config.xml information that is going to be displayed on App Stores.<br/>They are required when exporting the App to PhoneGap, but are not used for App debug and simulation in browsers.', WpAppKit::i18n_domain ) ?></span>
 			<br/><br/>
 			<label><?php _e( 'Application name', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<input type="text" name="wpak_app_name" value="<?php echo $main_infos['name'] ?>" />
@@ -140,7 +140,7 @@ public static function inner_phonegap_infos_box( $post, $current_box ) {
 			<label><?php _e( 'Application description', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<textarea name="wpak_app_desc"><?php echo $main_infos['desc'] ?></textarea>
 			<br/><br/>
-			<label><?php _e( 'Application id', WpAppKit::i18n_domain ) ?></label> : <br/>
+			<label><?php _e( 'Application ID', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<input type="text" name="wpak_app_phonegap_id" value="<?php echo $main_infos['app_phonegap_id'] ?>" />
 			<br/><br/>
 			<label><?php _e( 'Version', WpAppKit::i18n_domain ) ?></label> : <br/>
@@ -149,7 +149,7 @@ public static function inner_phonegap_infos_box( $post, $current_box ) {
 			<label><?php _e( 'Application versionCode (Android only)', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<input type="text" name="wpak_app_version_code" value="<?php echo $main_infos['version_code'] ?>" />
 			<br/><br/>
-			<label><?php _e( 'Phonegap version', WpAppKit::i18n_domain ) ?></label> : <br/>
+			<label><?php _e( 'PhoneGap version', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<input type="text" name="wpak_app_phonegap_version" value="<?php echo $main_infos['phonegap_version'] ?>" />
 			<br/><br/>
 			<label><?php _e( 'Application author', WpAppKit::i18n_domain ) ?></label> : <br/>
@@ -161,9 +161,9 @@ public static function inner_phonegap_infos_box( $post, $current_box ) {
 			<label><?php _e( 'Application author email', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<input type="text" name="wpak_app_author_email" value="<?php echo $main_infos['author_email'] ?>" />
 			<br/><br/>
-			<label><?php _e( 'Phonegap plugins', WpAppKit::i18n_domain ) ?></label> : <br/>
+			<label><?php _e( 'PhoneGap Plugins', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<textarea name="wpak_app_phonegap_plugins"><?php echo $main_infos['phonegap_plugins'] ?></textarea>
-			<span class="description"><?php _e( 'Write the phonegap plugins tags as defined in the PhoneGap documentation.<br/>Example : to include the "In App Browser" plugin for a Phonegap Build compilation, enter &lt;gap:plugin name="org.apache.cordova.inappbrowser" version="0.3.3" /&gt; directly in the textarea.', WpAppKit::i18n_domain ) ?></span>
+			<span class="description"><?php _e( 'Write the PhoneGap plugins tags as defined in the PhoneGap documentation.<br/>Example : to include the "In App Browser" plugin for a PhoneGap Build compilation, enter &lt;gap:plugin name="org.apache.cordova.inappbrowser" version="0.3.3" /&gt; directly in the textarea.', WpAppKit::i18n_domain ) ?></span>
 			<br/><br/>
 			<label><?php _e( 'Icons and splashscreens', WpAppKit::i18n_domain ) ?></label> : <br/>
 			<textarea name="wpak_app_icons"><?php echo $main_infos['icons'] ?></textarea>
diff --git a/wp-app-kit/lib/apps/build.php b/wp-app-kit/lib/apps/build.php
index d99f41b..1723580 100644
--- a/wp-app-kit/lib/apps/build.php
+++ b/wp-app-kit/lib/apps/build.php
@@ -25,7 +25,7 @@ public static function add_meta_boxes() {
 
 		add_meta_box(
 			'wpak_export_box',
-			__( 'Phonegap ready App export', WpAppKit::i18n_domain ),
+			__( 'PhoneGap ready App export', WpAppKit::i18n_domain ),
 			array( __CLASS__, 'inner_export_box' ),
 			'wpak_apps',
 			'side',
@@ -44,7 +44,7 @@ public static function inner_simulation_box( $post, $current_box ) {
 			<option value="off" <?php echo $debug_mode == 'off' ? 'selected="selected"' : '' ?>><?php _e( 'Off', WpAppKit::i18n_domain ) ?></option>
 			<option value="wp" <?php echo $debug_mode == 'wp' ? 'selected="selected"' : '' ?>><?php _e( 'Same as WordPress WP_DEBUG', WpAppKit::i18n_domain ) ?></option>
 		</select>
-		<br/><span class="description"><?php _e( 'If activated, echoes debug infos in the browser javascript console while simulating the app.', WpAppKit::i18n_domain ) ?></span>
+		<br/><span class="description"><?php _e( 'If activated, echoes debug infos in the browser JavaScript console while simulating the app.', WpAppKit::i18n_domain ) ?></span>
 		<br/>
 		<br/>
 		<a href="<?php echo WpakSimulator::get_simulator_url( $post->ID ) ?>" class="button button-large"><?php _e( 'View application in simulator', WpAppKit::i18n_domain ) ?></a>
@@ -57,8 +57,7 @@ public static function inner_simulation_box( $post, $current_box ) {
 		<br/>
 		<br/>
 		<div style="word-wrap: break-word;">
-			<label><?php _e( 'Web services', WpAppKit::i18n_domain ) ?> :</label><br/>
-			<?php _e( 'Synchronization', WpAppKit::i18n_domain ) ?> : <a href="<?php echo $wp_ws_url ?>"><?php echo $wp_ws_url ?></a>
+			<label><?php _e( 'Web Services Synchronization', WpAppKit::i18n_domain ) ?> : </label><a href="<?php echo $wp_ws_url ?>"><?php echo $wp_ws_url ?></a>
 		</div>
 		<?php wp_nonce_field( 'wpak-simulation-data-' . $post->ID, 'wpak-nonce-simulation-data' ) ?>
 		<?php
@@ -69,7 +68,7 @@ public static function inner_export_box( $post, $current_box ) {
 		$available_themes = WpakThemes::get_available_themes();
 		$current_theme = WpakThemesStorage::get_current_theme( $app_id );
 		?>
-		<span class="description wpak_export_infos"><?php _e( 'Phonegap exports are Zip files created in the WordPress uploads directory', WpAppKit::i18n_domain ) ?> : <br/><strong><?php echo str_replace( ABSPATH, '', self::get_export_files_path() ) ?></strong></span>
+		<span class="description wpak_export_infos"><?php _e( 'PhoneGap exports are Zip files created in the WordPress uploads directory', WpAppKit::i18n_domain ) ?> : <br/><strong><?php echo str_replace( ABSPATH, '', self::get_export_files_path() ) ?></strong></span>
 		<br/><span class="description"><?php echo sprintf( __( "The %s last App exports are memorized in this directory.", WpAppKit::i18n_domain ), self::export_file_memory ) ?></span>
 		<br/><br/>
 		<label><?php _e( 'Themes to include in app export', WpAppKit::i18n_domain ) ?> : </label><br/>
@@ -80,7 +79,7 @@ public static function inner_export_box( $post, $current_box ) {
 			<?php endforeach ?>
 		</select>
 		<label for="wpak_download_after_build"><?php _e( 'Download after export', WpAppKit::i18n_domain ) ?></label> <input type="checkbox" id="wpak_download_after_build" checked="checked" />
-		<a id="wpak_export_link" href="#" class="button button-primary button-large"><?php _e( 'Export as PhoneGap App sources', WpAppKit::i18n_domain ) ?>!</a>
+		<a id="wpak_export_link" href="#" class="button button-primary button-large"><?php _e( 'Export as PhoneGap App sources', WpAppKit::i18n_domain ) ?></a>
 		<div id="wpak_export_feedback"></div>
 
 			<?php $previous_exports = self::get_available_app_exports( $app_id ) ?>
@@ -91,7 +90,7 @@ public static function inner_export_box( $post, $current_box ) {
 					<option value="<?php echo str_replace( '.zip', '', $entry ) ?>"><?php echo get_date_from_gmt( date( 'Y-m-d H:i:s', $timestamp ), 'F j, Y H:i:s' ) ?></option>
 				<?php endforeach ?>
 			</select>
-			<a id="wpak_download_existing_link" href="#" class="button button-large"><?php _e( 'Download', WpAppKit::i18n_domain ) ?>!</a>
+			<a id="wpak_download_existing_link" href="#" class="button button-large"><?php _e( 'Download', WpAppKit::i18n_domain ) ?></a>
 		<?php endif ?>
 
 		<?php wp_nonce_field( 'wpak-export-data-' . $post->ID, 'wpak-nonce-export-data' ) ?>
diff --git a/wp-app-kit/lib/components/components-bo-settings.php b/wp-app-kit/lib/components/components-bo-settings.php
index 6c47410..5c9b917 100644
--- a/wp-app-kit/lib/components/components-bo-settings.php
+++ b/wp-app-kit/lib/components/components-bo-settings.php
@@ -32,7 +32,7 @@ public static function admin_enqueue_scripts() {
 	public static function add_meta_boxes() {
 		add_meta_box(
 			'wpak_app_components', 
-			__( 'App components', WpAppKit::i18n_domain ), 
+			__( 'App Components', WpAppKit::i18n_domain ), 
 			array( __CLASS__, 'inner_components_box' ), 
 			'wpak_apps', 
 			'normal', 
diff --git a/wp-app-kit/lib/simulator/simulator.php b/wp-app-kit/lib/simulator/simulator.php
index 613fdcb..73f7f55 100644
--- a/wp-app-kit/lib/simulator/simulator.php
+++ b/wp-app-kit/lib/simulator/simulator.php
@@ -82,7 +82,7 @@ public static function settings_panel() {
 					<h3><a href="<?php echo $appli_dir_url . '/config.js?wpak_app_id=' . $app_id ?>" target="_blank"><?php _e( 'View config.js', WpAppKit::i18n_domain ) ?></a></h3>
 
 					<br/><br/>
-					<h3><?php _e( 'Web services', WpAppKit::i18n_domain ) ?> :</h3>
+					<h3><?php _e( 'Web Services', WpAppKit::i18n_domain ) ?> :</h3>
 					<?php _e( 'Synchronization', WpAppKit::i18n_domain ) ?> : <a href="<?php echo $wp_ws_url ?>"><?php echo $wp_ws_url ?></a>
 				</div>
 
diff --git a/wp-app-kit/lib/themes/upload-themes.php b/wp-app-kit/lib/themes/upload-themes.php
index cc9d4a2..ffe8616 100644
--- a/wp-app-kit/lib/themes/upload-themes.php
+++ b/wp-app-kit/lib/themes/upload-themes.php
@@ -15,7 +15,7 @@ public static function hooks() {
 
 	public static function add_settings_panels() {
 		$capability_required = current_user_can( 'wpak_edit_apps' ) ? 'wpak_edit_apps' : 'manage_options';
-		add_submenu_page( WpakApps::menu_item, __( 'Upload themes', WpAppKit::i18n_domain ), __( 'Upload themes', WpAppKit::i18n_domain ), $capability_required, self::menu_item, array( __CLASS__, 'settings_panel' ) );
+		add_submenu_page( WpakApps::menu_item, __( 'Upload Themes', WpAppKit::i18n_domain ), __( 'Upload themes', WpAppKit::i18n_domain ), $capability_required, self::menu_item, array( __CLASS__, 'settings_panel' ) );
 	}
 	
 	public static function settings_panel() {
diff --git a/wp-app-kit/wp-app-kit.php b/wp-app-kit/wp-app-kit.php
index c12605f..b0d49b3 100644
--- a/wp-app-kit/wp-app-kit.php
+++ b/wp-app-kit/wp-app-kit.php
@@ -2,7 +2,7 @@
 
 /*
   Plugin Name: WP App Kit
-  Description: Build Phonegap Mobile apps based on your WordPress contents
+  Description: Build PhoneGap Mobile apps based on your WordPress contents
   Version: 0.1
  */