diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 44db1b7..8b693a8 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -299,7 +299,7 @@ class PageController extends Controller {
                     }
                     else if ($elem->getType() === \OCP\Files\FileInfo::TYPE_FILE and
                     (endswith($elempath, '.gpx') or endswith($elempath, '.GPX'))){
-                        $responseTxt .= '<li class="file ext_gpx"><a href="#" rel="'.$elempath.'">'.$elem->getName().'</a></li>';
+                        $responseTxt .= '<li class="gpx ext_gpx"><a href="#" rel="'.$elempath.'">'.$elem->getName().'</a></li>';
                     }
                 }
             }
diff --git a/css/gpxedit.css b/css/gpxedit.css
index c1ab783..0fcdc79 100644
--- a/css/gpxedit.css
+++ b/css/gpxedit.css
@@ -502,3 +502,9 @@ h2.popupTitle{
     margin-right: auto;
     display:block;
 }
+#saveButton{
+    width:18%;
+}
+#saveName{
+    width:78%;
+}
diff --git a/css/jQueryFileTree.min.css b/css/jQueryFileTree.min.css
index b2a349c..26ae4b7 100644
--- a/css/jQueryFileTree.min.css
+++ b/css/jQueryFileTree.min.css
@@ -1 +1 @@
-UL.jqueryFileTree{font-family:Verdana,sans-serif;font-size:11px;line-height:18px;padding:0;margin:0;display:none}UL.jqueryFileTree LI{list-style:none;padding:0 0 0 20px;margin:0;white-space:nowrap}UL.jqueryFileTree LI.directory{background:url(jqfileImages/directory.png) left top no-repeat}UL.jqueryFileTree LI.directory-locked{background:url(jqfileImages/directory-lock.png) left top no-repeat}UL.jqueryFileTree LI.expanded{background:url(jqfileImages/folder_open.png) left top no-repeat}UL.jqueryFileTree LI.file{background:url(jqfileImages/file.png) left top no-repeat}UL.jqueryFileTree LI.file-locked{background:url(jqfileImages/file-lock.png) left top no-repeat!important}UL.jqueryFileTree LI.wait{background:url(jqfileImages/spinner.gif) left top no-repeat}UL.jqueryFileTree LI.selected>a{font-weight:700}UL.jqueryFileTree LI.ext_3gp{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_afp,UL.jqueryFileTree LI.ext_afpa,UL.jqueryFileTree LI.ext_asp,UL.jqueryFileTree LI.ext_aspx{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_avi{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_bat{background:url(jqfileImages/application.png) left top no-repeat}UL.jqueryFileTree LI.ext_bmp{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_c,UL.jqueryFileTree LI.ext_cfm,UL.jqueryFileTree LI.ext_cgi{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_com{background:url(jqfileImages/application.png) left top no-repeat}UL.jqueryFileTree LI.ext_cpp{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_css{background:url(jqfileImages/css.png) left top no-repeat}UL.jqueryFileTree LI.ext_doc{background:url(jqfileImages/doc.png) left top no-repeat}UL.jqueryFileTree LI.ext_exe{background:url(jqfileImages/application.png) left top no-repeat}UL.jqueryFileTree LI.ext_gif{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_fla{background:url(jqfileImages/flash.png) left top no-repeat}UL.jqueryFileTree LI.ext_h{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_htm,UL.jqueryFileTree LI.ext_html{background:url(jqfileImages/html.png) left top no-repeat}UL.jqueryFileTree LI.ext_jar{background:url(jqfileImages/java.png) left top no-repeat}UL.jqueryFileTree LI.ext_jpeg,UL.jqueryFileTree LI.ext_jpg{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_js{background:url(jqfileImages/script.png) left top no-repeat}UL.jqueryFileTree LI.ext_lasso{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_log{background:url(jqfileImages/txt.png) left top no-repeat}UL.jqueryFileTree LI.ext_m4p{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_mov{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_mp3{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_mp4,UL.jqueryFileTree LI.ext_mpeg,UL.jqueryFileTree LI.ext_mpg{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_ogg{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_ogv{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_pcx{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_pdf{background:url(jqfileImages/pdf.png) left top no-repeat}UL.jqueryFileTree LI.ext_php{background:url(jqfileImages/php.png) left top no-repeat}UL.jqueryFileTree LI.ext_png{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_ppt{background:url(jqfileImages/ppt.png) left top no-repeat}UL.jqueryFileTree LI.ext_psd{background:url(jqfileImages/psd.png) left top no-repeat}UL.jqueryFileTree LI.ext_pl,UL.jqueryFileTree LI.ext_py{background:url(jqfileImages/script.png) left top no-repeat}UL.jqueryFileTree LI.ext_rb,UL.jqueryFileTree LI.ext_rbx,UL.jqueryFileTree LI.ext_rhtml{background:url(jqfileImages/ruby.png) left top no-repeat}UL.jqueryFileTree LI.ext_rpm{background:url(jqfileImages/linux.png) left top no-repeat}UL.jqueryFileTree LI.ext_ruby{background:url(jqfileImages/ruby.png) left top no-repeat}UL.jqueryFileTree LI.ext_sql{background:url(jqfileImages/db.png) left top no-repeat}UL.jqueryFileTree LI.ext_swf{background:url(jqfileImages/flash.png) left top no-repeat}UL.jqueryFileTree LI.ext_tif,UL.jqueryFileTree LI.ext_tiff{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_txt{background:url(jqfileImages/txt.png) left top no-repeat}UL.jqueryFileTree LI.ext_vb{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_wav{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_webm,UL.jqueryFileTree LI.ext_wmv{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_xls{background:url(jqfileImages/xls.png) left top no-repeat}UL.jqueryFileTree LI.ext_xml{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_zip{background:url(jqfileImages/zip.png) left top no-repeat}UL.jqueryFileTree A{color:#333;text-decoration:none;display:inline-block;padding:0 2px;cursor:pointer}UL.jqueryFileTree A:hover{background:#BDF}
+UL.jqueryFileTree{font-family:Verdana,sans-serif;font-size:11px;line-height:18px;padding:0;margin:0;display:none}UL.jqueryFileTree LI{list-style:none;padding:0 0 0 20px;margin:0;white-space:nowrap}UL.jqueryFileTree LI.directory{background:url(jqfileImages/directory.png) left top no-repeat}UL.jqueryFileTree LI.directory-locked{background:url(jqfileImages/directory-lock.png) left top no-repeat}UL.jqueryFileTree LI.expanded{background:url(jqfileImages/folder_open.png) left top no-repeat}UL.jqueryFileTree LI.gpx{background:url(jqfileImages/gpx.png) left top no-repeat}UL.jqueryFileTree LI.file{background:url(jqfileImages/file.png) left top no-repeat}UL.jqueryFileTree LI.file-locked{background:url(jqfileImages/file-lock.png) left top no-repeat!important}UL.jqueryFileTree LI.wait{background:url(jqfileImages/spinner.gif) left top no-repeat}UL.jqueryFileTree LI.selected>a{font-weight:700}UL.jqueryFileTree LI.ext_3gp{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_afp,UL.jqueryFileTree LI.ext_afpa,UL.jqueryFileTree LI.ext_asp,UL.jqueryFileTree LI.ext_aspx{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_avi{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_bat{background:url(jqfileImages/application.png) left top no-repeat}UL.jqueryFileTree LI.ext_bmp{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_c,UL.jqueryFileTree LI.ext_cfm,UL.jqueryFileTree LI.ext_cgi{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_com{background:url(jqfileImages/application.png) left top no-repeat}UL.jqueryFileTree LI.ext_cpp{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_css{background:url(jqfileImages/css.png) left top no-repeat}UL.jqueryFileTree LI.ext_doc{background:url(jqfileImages/doc.png) left top no-repeat}UL.jqueryFileTree LI.ext_exe{background:url(jqfileImages/application.png) left top no-repeat}UL.jqueryFileTree LI.ext_gif{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_fla{background:url(jqfileImages/flash.png) left top no-repeat}UL.jqueryFileTree LI.ext_h{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_htm,UL.jqueryFileTree LI.ext_html{background:url(jqfileImages/html.png) left top no-repeat}UL.jqueryFileTree LI.ext_jar{background:url(jqfileImages/java.png) left top no-repeat}UL.jqueryFileTree LI.ext_jpeg,UL.jqueryFileTree LI.ext_jpg{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_js{background:url(jqfileImages/script.png) left top no-repeat}UL.jqueryFileTree LI.ext_lasso{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_log{background:url(jqfileImages/txt.png) left top no-repeat}UL.jqueryFileTree LI.ext_m4p{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_mov{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_mp3{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_mp4,UL.jqueryFileTree LI.ext_mpeg,UL.jqueryFileTree LI.ext_mpg{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_ogg{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_ogv{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_pcx{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_pdf{background:url(jqfileImages/pdf.png) left top no-repeat}UL.jqueryFileTree LI.ext_php{background:url(jqfileImages/php.png) left top no-repeat}UL.jqueryFileTree LI.ext_png{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_ppt{background:url(jqfileImages/ppt.png) left top no-repeat}UL.jqueryFileTree LI.ext_psd{background:url(jqfileImages/psd.png) left top no-repeat}UL.jqueryFileTree LI.ext_pl,UL.jqueryFileTree LI.ext_py{background:url(jqfileImages/script.png) left top no-repeat}UL.jqueryFileTree LI.ext_rb,UL.jqueryFileTree LI.ext_rbx,UL.jqueryFileTree LI.ext_rhtml{background:url(jqfileImages/ruby.png) left top no-repeat}UL.jqueryFileTree LI.ext_rpm{background:url(jqfileImages/linux.png) left top no-repeat}UL.jqueryFileTree LI.ext_ruby{background:url(jqfileImages/ruby.png) left top no-repeat}UL.jqueryFileTree LI.ext_sql{background:url(jqfileImages/db.png) left top no-repeat}UL.jqueryFileTree LI.ext_swf{background:url(jqfileImages/flash.png) left top no-repeat}UL.jqueryFileTree LI.ext_tif,UL.jqueryFileTree LI.ext_tiff{background:url(jqfileImages/picture.png) left top no-repeat}UL.jqueryFileTree LI.ext_txt{background:url(jqfileImages/txt.png) left top no-repeat}UL.jqueryFileTree LI.ext_vb{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_wav{background:url(jqfileImages/music.png) left top no-repeat}UL.jqueryFileTree LI.ext_webm,UL.jqueryFileTree LI.ext_wmv{background:url(jqfileImages/film.png) left top no-repeat}UL.jqueryFileTree LI.ext_xls{background:url(jqfileImages/xls.png) left top no-repeat}UL.jqueryFileTree LI.ext_xml{background:url(jqfileImages/code.png) left top no-repeat}UL.jqueryFileTree LI.ext_zip{background:url(jqfileImages/zip.png) left top no-repeat}UL.jqueryFileTree A{color:#333;text-decoration:none;display:inline-block;padding:0 2px;cursor:pointer}UL.jqueryFileTree A:hover{background:#BDF}
diff --git a/css/jqfileImages/gpx.png b/css/jqfileImages/gpx.png
new file mode 100644
index 0000000..690c108
Binary files /dev/null and b/css/jqfileImages/gpx.png differ
diff --git a/templates/gpxcontent.php b/templates/gpxcontent.php
index 6c3d3f2..f49db95 100644
--- a/templates/gpxcontent.php
+++ b/templates/gpxcontent.php
@@ -25,11 +25,13 @@ p($_['gpxedit_version']);
     <hr/>
     <h2 id="loadtitle">Load <b id="loadoptiontoggle"><i class="fa fa-expand"></i></b></h2>
     <div id="loaddiv" style="display:none;">
+        <p>Select a gpx file to load it on the map</p><br/>
         <div id="loadtree"></div>
     </div>
     <hr/>
     <h2 id="savetitle">Save <b id="saveoptiontoggle"><i class="fa fa-expand"></i></b></h2>
     <div id="savediv" style="display:none;">
+        <p>Select a folder, set a name and click "Save" button</p><br/>
         <div id="savetree"></div>
         <input id="saveName"></input>
         <button id="saveButton">Save</button>