diff --git a/languages/en.lang b/languages/en.lang
index 1848a17..eee810c 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -20,12 +20,14 @@ track_off-track		= Off-track
 track_hitchhiking	= Hitchhiking
 track_download		= Download GPX Track
 
-upload_title		= Picture & Video Uploads
+upload_media_title	= Picture & Video Uploads
+upload_pos_title	= Additional Position
 upload_mode_archived= Project "$0" is archived. No upload allowed
 upload_success		= $0 uploaded successfully
 upload_media_exist	= Picture $0 already exists
 new_position		= New Position
 
+
 post_message		= Message
 post_name			= Name
 post_new_message	= New message
diff --git a/languages/es.lang b/languages/es.lang
index 0d71fff..f79a677 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -20,7 +20,8 @@ track_off-track		= Variante
 track_hitchhiking	= Autostop
 track_download		= Descarga la ruta GPX
 
-upload_title		= Cargar fotos y videos
+upload_media_title	= Cargar fotos y videos
+upload_pos_title	= Subir posición
 upload_mode_archived= El proyecto "$0" esta archivado. No se puede cargar
 upload_success		= $0 ha sido subido
 upload_media_exist	= La imagen $0 ya existe
diff --git a/languages/fr.lang b/languages/fr.lang
index 9e8e492..3ce5023 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -20,7 +20,8 @@ track_off-track		= Variante
 track_hitchhiking	= Hors rando
 track_download		= Télécharger la trace GPX
 
-upload_title		= Uploader photos & vidéos
+upload_media_title	= Uploader photos & vidéos
+upload_pos_title	= Position supplémentaire
 upload_mode_archived= Le projet "$0" a été archivé. Aucun upload possible
 upload_success		= $0 a été uploadé
 upload_media_exist	= l'image $0 existe déjà
diff --git a/src/components/project.vue b/src/components/project.vue
index 3193381..973d93e 100644
--- a/src/components/project.vue
+++ b/src/components/project.vue
@@ -560,8 +560,9 @@ export default {
 					+ window.pageYOffset
 					- parseFloat(getComputedStyle(this.$refs.feedSimpleBar.$el).paddingTop)
 				);
-				bFound = true;
+				aoRefs[0].executeMainAction();
 				this.spot.flushHash(['post', 'message']);
+				bFound = true;
 			}
 
 			return bFound;
diff --git a/src/components/projectMediaLink.vue b/src/components/projectMediaLink.vue
index 3a52456..f3b671b 100644
--- a/src/components/projectMediaLink.vue
+++ b/src/components/projectMediaLink.vue
@@ -23,6 +23,11 @@ export default {
 			this.$refs[this.type=='marker'?'takenon':'postedon'].outerHTML +
 			this.$refs[this.type=='marker'?'postedon':'takenon'].outerHTML
 		;
+	},
+	methods: {
+		openMedia() {
+			this.$refs.link.click();
+		}
 	}
 }
 </script>
@@ -36,6 +41,7 @@ export default {
 		:data-id="options.id_media"
 		:data-title="title"
 		:data-orientation="options.rotate"
+		ref="link"
 	>
 		<img 
 			:src="options.thumb_path"
diff --git a/src/components/projectPost.vue b/src/components/projectPost.vue
index 4a12f98..60425b6 100644
--- a/src/components/projectPost.vue
+++ b/src/components/projectPost.vue
@@ -109,6 +109,16 @@
 							this.sending = false;
 						});
 				}
+			},
+			executeMainAction() {
+				switch(this.options.type) {
+					case 'message':
+						this.panMapToMessage();
+						break;
+					case 'media':
+						this.$refs.medialink.openMedia();
+						break;
+				}
 			}
 		},
 		mounted() {
@@ -156,7 +166,7 @@
 				</a>
 			</div>
 			<div v-else-if="options.type == 'media'" class="body-box">
-				<projectMediaLink :options="options" :type="'post'" />
+				<projectMediaLink :options="options" :type="'post'" ref="medialink" />
 			</div>
 			<div v-else-if="options.type == 'post'">
 				<p class="message">{{ options.content }}</p>
diff --git a/src/components/upload.vue b/src/components/upload.vue
index 9f3d568..188b26e 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -74,7 +74,7 @@ export default {
 <template>
 	<div id="upload">
 		<a name="back" class="button" href="#project"><SpotIcon :icon="'back'" :text="spot.lang('nav_back')" /></a>
-		<h1>{{ spot.lang('upload_title') }}</h1>
+		<h1>{{ spot.lang('upload_media_title') }}</h1>
 		<h2>{{ this.project.name }}</h2>
 		<div class="section" v-if="project.editable">
 			<input id="fileupload" type="file" name="files[]" :data-url="this.spot.getActionLink('upload')" multiple />
@@ -90,6 +90,7 @@ export default {
 				<SpotButton :classes="'save'" :icon="'save'" :text="spot.lang('save')" @click="addComment(file)" />
 			</div>
 		</div>
+		<h1>{{ spot.lang('upload_pos_title') }}</h1>
 		<div class="section location">
 			<SpotButton :icon="'message'" :text="spot.lang('new_position')" @click="addPosition()" />
 		</div>
diff --git a/src/styles/_color.scss b/src/styles/_color.scss
index 6915f2e..e0e4711 100644
--- a/src/styles/_color.scss
+++ b/src/styles/_color.scss
@@ -38,10 +38,13 @@ $download-hover:	#0078A8;
 
 //Legend colors
 $legend:			$default;
+$main-track:		#00ff78;
+$off-track:			#0000ff;
+$hitchhiking:		#ff7814;
 
 //Tracks
-$track-start:		$message;
-$track-end:			#FF7814;
+$track-start:		$main-track;
+$track-end:			$hitchhiking;
 
 //Loader
 $loader: 			$default-bg;
diff --git a/src/styles/_page.project.feed.scss b/src/styles/_page.project.feed.scss
index 96488b2..eba840a 100644
--- a/src/styles/_page.project.feed.scss
+++ b/src/styles/_page.project.feed.scss
@@ -18,7 +18,6 @@
 
 				button[name=submit] {
 					margin-left: 1em;
-					margin-bottom: 0.5em;
 				}
 			}
 
diff --git a/src/styles/_page.project.panel.scss b/src/styles/_page.project.panel.scss
index 5fb4549..267f815 100644
--- a/src/styles/_page.project.panel.scss
+++ b/src/styles/_page.project.panel.scss
@@ -146,8 +146,12 @@ $panel-actual-width: min($panel-width, #{$panel-width-max});
 				color: color.$default;
 			}
 
-			&:hover .fa {
-				color: color.$default-hover;
+			&:hover {
+				background-color: color.$default-inv-bg;
+
+				.fa {
+					color: color.$default-inv;
+				}
 			}
 		}
 	}
diff --git a/src/styles/_page.project.scss b/src/styles/_page.project.scss
index 9b95def..551d2c3 100644
--- a/src/styles/_page.project.scss
+++ b/src/styles/_page.project.scss
@@ -38,8 +38,8 @@
 	.fa-stack {
 		.fa-message {
 			font-size: 32px;
-			text-shadow: rgba(0, 0, 0, 0.5) 3px 3px 3px;
-			color: color.$message-bg;
+			text-shadow: color.$over-img-shadow 3px 3px 3px;
+			color: color.$main-track;
 		}
 		.fa-message-in {
 		    font-size: 13px;