Restyle GPX upload
More upload fixes