diff --git a/ws/static/new.html.tmpl b/ws/static/new.html.tmpl
index f9eadbfd13d480ff05d525f4a8b4e07879614e62..b29560873b90a291fc1bc44a6cdda69cc0627600 100644
--- a/ws/static/new.html.tmpl
+++ b/ws/static/new.html.tmpl
@@ -12,9 +12,9 @@
                 <input type="text" id="name" name="name">
             </div>
             <div class="input">
-                <h3>Forge type</h3>
                 <fieldset>
-                <legend>RSS</legend>
+                <legend>Forge Type</legend>
+                <h4>RSS</h4>
                 <div class="input-wrapper">
                 <input type="radio" id="github" name="forge" value="github">
                 <label for="github">Github</label>
@@ -27,10 +27,7 @@
                 <input type="radio" id="forgejo" name="forge" value="forgejo">
                 <label for="forgejo">Forgejo</label>
                 </div>
-                </fieldset>
-
-                <fieldset>
-                <legend>Raw git</legend>
+                <h4>Raw git</h4>
                 <div class="input-wrapper">
                 <input type="radio" id="gitlab" name="forge" value="gitlab">
                 <label for="gitlab">GitLab</label>
@@ -49,7 +46,7 @@
                 </div>
                 </fieldset>
             </div>
-            <input class="button" type="submit" formaction="/new" value="Next">
+            <button class="button" type="submit" formaction="/new">Next</button>
         </form>
         </div>
 {{- template "footer" .Version }}