diff --git a/Python/app/ChameleonVisionApp.py b/Python/app/ChameleonVisionApp.py
index d7f0181ed..d0fa4be06 100644
--- a/Python/app/ChameleonVisionApp.py
+++ b/Python/app/ChameleonVisionApp.py
@@ -2,8 +2,8 @@ import tornado.web
 import tornado.websocket
 import os
 
-from handlers.MainHandler import MainHandler
-from handlers.SocketHandler import ChameleonWebSocket
+from .handlers.MainHandler import MainHandler
+from .handlers.SocketHandler import ChameleonWebSocket
 from tornado.options import define
 
 define("port", default=8888, help="run on the given port", type=int)
@@ -12,11 +12,11 @@ define("port", default=8888, help="run on the given port", type=int)
 class ChameleonApplication(tornado.web.Application):
     def __init__(self):
         handlers = [(r"/", MainHandler),
-                    (r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}),
                     (r"/websocket", ChameleonWebSocket),
                     (r"/css/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/css")}),
                     (r"/js/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/js")}),
                     (r"/templates/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/templates")}),
+                    (r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}),
                     (r"/assets/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/assets")})]
 
         settings = dict(