diff --git a/gns3server/modules/qemu/__init__.py b/gns3server/modules/qemu/__init__.py
index b9884e8e3..cc7cfdbb7 100644
--- a/gns3server/modules/qemu/__init__.py
+++ b/gns3server/modules/qemu/__init__.py
@@ -629,7 +629,8 @@ def qemu_list(self, request):
             if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]):
                 paths.append(os.path.join(os.environ["PROGRAMFILES"], "qemu"))
         elif sys.platform.startswith("darwin"):
-            paths.append(os.path.join(os.getcwd(), "../Resources/Qemu/bin/"))
+            # add a specific location on Mac OS X regardless of what's in $PATH
+            paths.append("/usr/local/bin")
         for path in paths:
             try:
                 for f in os.listdir(path):
diff --git a/gns3server/templates/upload.html b/gns3server/templates/upload.html
index f34e49416..ceec7f68c 100644
--- a/gns3server/templates/upload.html
+++ b/gns3server/templates/upload.html
@@ -13,10 +13,8 @@
 </form>
 {%if items%}
 <h3>Files on {{host}}</h3>
-<ol>
 {%for item in items%}
-<li>{{path}}/{{item}}</a></li>
+<p>{{path}}/{{item}}</a></p>
 {%end%}
 {%end%}
-</ol>
 </body>
\ No newline at end of file
diff --git a/gns3server/version.py b/gns3server/version.py
index 2680c5ca1..b2ab6d391 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,5 +23,5 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.0.dev1"
-__version_info__ = (1, 0, 0, -99)
+__version__ = "1.0"
+__version_info__ = (1, 0, 0, 0)