diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1552e4a64273ab03fe7dad3ccfd3e2c96d5c422e..5359f6c3e15fdc5e2460b2b3c13d167c34924c05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ TBD
 - Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602))
 - Bump required version of PyYAML to 6.0.1 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/609))
 - Fix enable/disable schedule toggles on schedule list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/606))
+- Fix formatting on Creation page when server jars is unavailable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/601))
 ### Refactor
 - Replace "in_file" helper method ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/605))
 ### Tweaks
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index ec251739e1f53ba68b5f8ee89e7c22d3f111bd98..69f9e5af0b125fa23ce3060d9162a3e01079fbd5 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -172,17 +172,7 @@
                 <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
                   }}</button>
               </fieldset>
-              {% if not data["server_api"] %}
-              <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
-                <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: white;"></i>&nbsp;{{ translate('error', 'serverJars1', data['lang']) }}<a style="color: red;" ; href="https://status.craftycontrol.com/status/craftycontrol" target="_blank">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
-                  &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p>
-              </div>
-
             </div>
-            <button type="submit" class="btn btn-primary mr-2">{{ translate('serverWizard', 'buildServer',
-              data['lang']) }}</button>
-            <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
-              }}</button>
           </fieldset>
           {% if not data["server_api"] and data["online"] %}
           <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
@@ -194,9 +184,7 @@
           <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
             <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{ translate('error', 'noInternet', data['lang']) }}</p></div>
           {% end %}
-              {% end %}
         </div>
-      </div>
       </form>
     </div>