diff --git a/readme.md b/readme.md
index 20871fc..6f5a498 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,8 @@
 # Spot Project
 [Spot](https://www.findmespot.com) & GPX integration
+
 ## Dependencies
+
 * npm 18+
 * composer
 * php-mbstring
@@ -11,13 +13,17 @@
 * ffprobe & ffmpeg
 * STARTTLS Email Server (use Gmail if none available)
 * Optional: Geo Caching Server (WMTS Caching Service)
+
 ## PHP Configuration
+
 * max_execution_time = 300
 * memory_limit = 500M
 * post_max_size = 4G
 * upload_max_filesize = 4G
 * max_file_uploads = 50
+
 ## Getting started
+
 1. Clone Git onto web server
 2. composer install
 3. npm install webpack
@@ -27,9 +33,11 @@
 7. Copy settings-sample.php to settings.php and populate
 8. Go to #admin and create a new project, feed & maps
 9. Add a GPX file named <project_codename>.gpx to /geo/
+
 ## To Do List
+
 * Add mail frequency slider
 * Use WMTS servers directly when not using Geo Caching Server
 * Allow HEIF picture format
 * Fix .MOV playback on windows firefox
-* Garmin InReach Integration
\ No newline at end of file
+* Garmin InReach Integration
diff --git a/src/Spot.vue b/src/Spot.vue
index e58dd74..069c516 100644
--- a/src/Spot.vue
+++ b/src/Spot.vue
@@ -1,21 +1,27 @@
 <script>
 import Project from './components/project.vue';
 import Admin from './components/admin.vue';
+import Upload from './components/upload.vue';
 
 const aoRoutes = {
-	'project':	Project,
-	'admin':	Admin
+	'project': Project,
+	'admin': Admin,
+	'upload': Upload
 };
 
 export default {
 	data() {
 		return {
-			hash: {}
+			hash: {},
+			consts: this.spot.consts,
+			user: this.spot.vars('user')
 		};
 	},
 	provide() {
 		return {
-			projects: this.spot.vars('projects')
+			projects: this.spot.vars('projects'),
+			consts: this.consts,
+			user: this.user
 		};
 	},
 	inject: ['spot'],
@@ -25,12 +31,15 @@ export default {
 			return aoRoutes[this.hash.page];
 		}
 	},
+	created() {
+		//User
+		this.user.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || this.consts.default_timezone;
+	},
 	mounted() {
 		window.addEventListener('hashchange', () => {this.onHashChange();});
 		var oEvent = new Event('hashchange');
 		window.dispatchEvent(oEvent);
-	}
-	,
+	},
 	methods: {
 		_hash(hash, bReboot) {
 			bReboot = bReboot || false;
diff --git a/src/components/project.vue b/src/components/project.vue
index 9ad2029..959550b 100644
--- a/src/components/project.vue
+++ b/src/components/project.vue
@@ -38,7 +38,6 @@ export default {
 			posts: [],
 			nlFeedbacks: [],
 			nlLoading: false,
-			user: {name:'', email:''},
 			baseMaps: {},
 			baseMap: null,
 			messages: null,
@@ -86,11 +85,10 @@ export default {
 	},
 	provide() {
 		return {
-			user: this.user,
 			project: this.project
 		};
 	},
-	inject: ['spot', 'projects'],
+	inject: ['spot', 'projects', 'user'],
 	mounted() {
 		this.spot.addPage('project', {
 			onResize: () => {
@@ -112,7 +110,6 @@ export default {
 			this.initProject();
 			if(bFirstLoad) this.initLightbox();
 			this.initFeed();
-			if(bFirstLoad) this.initSettings();
 			this.initMap();
 		},
 		initProject() {
@@ -154,9 +151,6 @@ export default {
 			//Scroll to post
 			if(this.$parent.hash.items.length == 3) this.findPost({type: this.$parent.hash.items[1], id: this.$parent.hash.items[2]});
 		},
-		initSettings() {
-			this.user = this.spot.vars('user');
-		},
 		async initMap() {
 			//Get Map Info
 			const aoMarkers = await this.spot.get2('markers', {id_project: this.project.id});
diff --git a/src/components/upload.vue b/src/components/upload.vue
new file mode 100644
index 0000000..9c1cc23
--- /dev/null
+++ b/src/components/upload.vue
@@ -0,0 +1,77 @@
+<script>
+import SpotButton from './spotButton.vue';
+import "blueimp-file-upload/js/vendor/jquery.ui.widget.js";
+import "blueimp-file-upload/js/jquery.iframe-transport.js";
+import "blueimp-file-upload/js/jquery.fileupload.js";
+
+export default {
+	name: 'upload',
+	components: { SpotButton },
+	inject: ['spot', 'projects', 'consts', 'user'],
+	data() {
+		return {
+			project: this.projects[this.spot.vars('default_project_codename')],
+			files: [],
+			logs: [],
+			progress: 0
+		};
+	},
+	mounted() {
+		this.spot.addPage('upload', {});
+
+		if(this.project.editable) {
+			$('#fileupload')
+				.fileupload({
+					dataType: 'json',
+					formData: {t: this.user.timezone},
+					acceptFileTypes: /(\.|\/)(gif|jpe?g|png|mov)$/i,
+					done: (e, asData) => {
+						$.each(asData.result.files, (iKey, oFile) => {
+							let bError = ('error' in oFile);
+
+							//Feedback
+							this.logs.push(bError?oFile.error:(this.spot.lang('upload_success', [oFile.name])));
+
+							//Comments
+							oFile.content = '';
+							if(!bError) this.files.push(oFile);
+						});
+					},
+					progressall: (e, data) => {
+						this.progress = parseInt(data.loaded / data.total * 100, 10);
+					}
+				});
+		}
+		else this.logs = [this.spot.lang('upload_mode_archived', [this.project.name])];
+	},
+	methods: {
+		addComment(oFile) {
+			this.spot.get2('add_comment', {id: oFile.id, content: oFile.content})
+				.then((asData) => {this.logs.push(this.spot.lang('media_comment_update', asData.filename));})
+				.catch((sMsgId) => {this.logs.push(this.spot.lang(sMsgId));});
+		}
+	}
+}
+</script>
+<template>
+	<div id="upload">
+		<a name="back" class="button" href="#project"><i class="fa fa-back push"></i>{{ spot.lang('nav_back') }}</a>
+		<h1>{{ spot.lang('upload_title') }}</h1>
+		<h2>{{ this.project.name }}</h2>
+		<input v-if="project.editable" id="fileupload" type="file" name="files[]" :data-url="this.spot.getActionLink('upload')" multiple>
+		<div class="progress" v-if="progress > 0">
+			<div class="bar" :style="{width:progress+'%'}"></div>
+		</div>
+		<div class="comment" v-for="file in files">
+			<img class="thumb" :src="file.thumbnail" />
+			<div class="form">
+				<input class="content" name="content" type="text" v-model="file.content" />
+				<input class="id" name="id" type="hidden" :value="file.id" />
+				<SpotButton :classes="'save'" :icon="'save'" :text="spot.lang('save')" @click="addComment(file)" />
+			</div>
+		</div>
+		<div class="logs" v-if="logs.length > 0">
+			<p class="log" v-for="log in logs">{{ log }}.</p>
+		</div>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/styles/_fa.scss b/src/styles/_fa.scss
index 005710d..af94df3 100644
--- a/src/styles/_fa.scss
+++ b/src/styles/_fa.scss
@@ -79,6 +79,9 @@ $fa-css-prefix: fa;
 .#{$fa-css-prefix}-config:before { content: fa-content($fa-var-cogs); }
 .#{$fa-css-prefix}-upload:before { content: fa-content($fa-var-cloud-upload); }
 
+/* Upload */
+.#{$fa-css-prefix}-save:before { content: fa-content($fa-var-floppy-disk); }
+
 /* Feed */
 .#{$fa-css-prefix}-post:before { content: fa-content($fa-var-comment); }
 .#{$fa-css-prefix}-media:before { content: fa-content($fa-var-photo-video); }
diff --git a/src/styles/_page.upload.scss b/src/styles/_page.upload.scss
index b860477..9c88343 100644
--- a/src/styles/_page.upload.scss
+++ b/src/styles/_page.upload.scss
@@ -1,9 +1,20 @@
 #upload {
 	padding: 1em;
 	
-	.bar {
-		height: 18px;
-		background: green;
+	input[type="file"] {
+		border: 1px solid #333;
+		border-radius: 3px;
+	}
+
+	.progress {
+		margin: 1rem 0;
+  		border: 1px solid #333;
+		border-radius: 3px;
+
+		.bar {
+			height: 18px;
+			background: green;
+		}
 	}
 
 	.comment {
@@ -13,7 +24,8 @@
 			width: 30%;
 			max-width: 100px;
 		}
-		form {
+		
+		.form {
 			display: inline-block;
 			width: calc(70% - 1em);
 			min-width: calc(100% - 100px - 1em);
@@ -25,6 +37,7 @@
 				box-sizing: border-box;
 				padding: 0.5em;
 				border: 1px solid #333;
+				border-radius: 3px;
 			}
 			
 			.save {
@@ -32,5 +45,16 @@
 				padding: 0.5em;
 			}
 		}
-	}		
+	}
+	
+	.logs {
+		border: 1px solid #333;
+		border-radius: 3px;
+  		margin-top: 1rem;
+		padding: 1rem;
+
+		p.log {
+			margin: 0;
+		}
+	}
 }
\ No newline at end of file