diff --git a/app/templates/project.html b/app/templates/project.html
index 532089f..42af54e 100644
--- a/app/templates/project.html
+++ b/app/templates/project.html
@@ -9,7 +9,7 @@
     <div class="indent">
 
         <h2> {{project_name}} </h2>
-        <form method="POST" enctype="multipart/form-data" action="/add_project">
+        <form method="POST" enctype="multipart/form-data" action="/project_add">
         <input type="hidden" name="project_name" value="{{project_name}}">
 
         <div class="row">
@@ -92,8 +92,7 @@
 
                     <div class="col-6">
 
-                    <form method="POST" enctype="multipart/form-data" action="/build_project">
-                        <input type="hidden" name="project_name" value="{{project_name}}">
+                    <form method="POST" enctype="multipart/form-data" action="/project/{{project_name}}/build">
                         <button class="btn btn-primary" type="submit" value="start">Build</button>
                     </form>
                     </div>
@@ -101,24 +100,20 @@
                 
                 <div class="row">
                     <div class="col-6">
-                        <form method="POST" enctype="multipart/form-data" action="/exec_project">
-                            <input type="hidden" name="project_name" value="{{project_name}}">
+                        <form method="POST" enctype="multipart/form-data" action="/project/{{project_name}}/exec">
                             <button class="btn btn-primary" type="submit" value="start">Start Local</button>
                         </form>
 
-                        <form method="POST" enctype="multipart/form-data" action="/exec_project?no_exec=true">
-                            <input type="hidden" name="project_name" value="{{project_name}}">
+                        <form method="POST" enctype="multipart/form-data" action="/project/{{project_name}}/exec?no_exec=true">
                             <button class="btn btn-primary" type="submit" value="start">File Local</button>
                         </form>
                     </div>
                     <div class="col-6">
-                        <form method="POST" enctype="multipart/form-data" action="/exec_project?remote=true">
-                            <input type="hidden" name="project_name" value="{{project_name}}">
+                        <form method="POST" enctype="multipart/form-data" action="/project/{{project_name}}/exec?remote=true">
                             <button class="btn btn-primary" type="submit" value="start">Start Remote</button>
                         </form>
 
-                        <form method="POST" enctype="multipart/form-data" action="/exec_project?remote=true&no_exec=true">
-                            <input type="hidden" name="project_name" value="{{project_name}}">
+                        <form method="POST" enctype="multipart/form-data" action="/project/{{project_name}}/exec?remote=true&no_exec=true">
                             <button class="btn btn-primary" type="submit" value="start">File Remote</button>
                         </form>
                     </div>
diff --git a/app/templates/project_add_get.html b/app/templates/project_add_get.html
index 9869d2d..cf926f6 100644
--- a/app/templates/project_add_get.html
+++ b/app/templates/project_add_get.html
@@ -12,7 +12,7 @@
 
 <div class="col-md-3">
 
-    <form method="POST" enctype="multipart/form-data" action="/add_project">
+    <form method="POST" enctype="multipart/form-data" action="/api/project">
 
     <div class="row row-cols-lg-auto g-3">
 
diff --git a/app/views.py b/app/views.py
index 78e5767..6a954cf 100644
--- a/app/views.py
+++ b/app/views.py
@@ -157,7 +157,7 @@ def project(name):
         )
 
 
-@views.route("/add_project", methods=['POST', 'GET'])
+@views.route("/project_add", methods=['POST', 'GET'])
 def add_project():
     if request.method == 'POST':
         settings = Settings()
@@ -247,11 +247,10 @@ def supermega_thread(project: Project):
     )
 
 
-@views.route("/build_project", methods=['POST', 'GET'])
-def build_project():
+@views.route("/project/<project_name>/build", methods=['POST', 'GET'])
+def build_project(project_name):
     global thread_running
 
-    project_name = request.form.get('project_name')
     project = storage.get_project(project_name)
     project.settings.try_start_final_infected_exe = False
 
@@ -259,10 +258,10 @@ def build_project():
     thread.start()
     thread_running = True
 
-    return redirect("/status_project/{}".format(project_name), code=302)
+    return redirect("/project/{}/status".format(project_name), code=302)
 
 
-@views.route("/status_project/<project_name>")
+@views.route("/project/<project_name>/status")
 def status_project(project_name):
     global thread_running
     if thread_running:
@@ -273,9 +272,8 @@ def status_project(project_name):
         return redirect("/project/{}".format(project_name), code=302)
 
 
-@views.route("/exec_project", methods=['POST', 'GET'])
-def start_project():
-    project_name = request.form.get('project_name')
+@views.route("/project/<project_name>/exec", methods=['POST', 'GET'])
+def start_project(project_name):
     project = storage.get_project(project_name)
     if project == None:
         return redirect("/", code=302)