diff --git a/lincs/src/org/labkey/lincs/LincsController.java b/lincs/src/org/labkey/lincs/LincsController.java
index 19dc19ad..045023d0 100644
--- a/lincs/src/org/labkey/lincs/LincsController.java
+++ b/lincs/src/org/labkey/lincs/LincsController.java
@@ -66,7 +66,7 @@
 import org.labkey.api.targetedms.TargetedMSService;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.FileUtil;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.view.ActionURL;
@@ -1039,7 +1039,7 @@ public ModelAndView getSuccessView(ClueCredentialsForm form)
             return new HtmlView(
                     DIV("Clue/PSP details saved!",
                             BR(),
-                            new Link.LinkBuilder("Back to Project").href(projectUrl).build()
+                            new LinkBuilder("Back to Project").href(projectUrl).build()
                     )
             );
         }
@@ -1125,7 +1125,7 @@ public ModelAndView getSuccessView(CromwellConfigForm cromwellConfigForm)
             return new HtmlView(
                     DIV("Cromwell details saved!",
                             BR(),
-                            new Link.LinkBuilder("Back to Project").href(projectUrl).build()
+                            new LinkBuilder("Back to Project").href(projectUrl).build()
                     )
             );
         }
diff --git a/lincs/src/org/labkey/lincs/LincsDataTable.java b/lincs/src/org/labkey/lincs/LincsDataTable.java
index 3d2e8a57..006f1a40 100644
--- a/lincs/src/org/labkey/lincs/LincsDataTable.java
+++ b/lincs/src/org/labkey/lincs/LincsDataTable.java
@@ -31,7 +31,7 @@
 import org.labkey.api.settings.AppProps;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
@@ -87,9 +87,9 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 // <span style="white-space: nowrap;"> is recommended instead of deprecated <nobr></nobr>
                 SPAN(
                     at(style, "white-space: nowrap;"),
-                    new Link.LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
+                    new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
                     HtmlString.NBSP,
-                    new Link.LinkBuilder("Skyline").href(docDetailsUrl).clearClasses()
+                    LinkBuilder.simpleLink("Skyline", docDetailsUrl)
                 ).appendTo(out);
             }
 
@@ -158,7 +158,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                         ActionURL url = new ActionURL(LincsController.SubmitPspJobAction.class, getContainer());
                         url.addParameter("runId", runId);
 
-                        out.write(new Link.LinkBuilder(" [Submit Job]").href(url).usePost());
+                        out.write(new LinkBuilder(" [Submit Job]").href(url).usePost());
                     }
                     return;
                 }
@@ -376,9 +376,9 @@ private void renderGridCell(HtmlWriter out, String analyticsScript, String downl
             SPAN(
                 at(style, "white-space: nowrap;"),
                 HtmlString.NBSP,
-                new Link.LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
+                new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
                 HtmlString.NBSP,
-                new Link.LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
+                new LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
                 HtmlString.NBSP,
                 morpheusUrl != null ? HtmlString.NBSP : null,
                 morpheusUrl,
diff --git a/nextflow/src/org/labkey/nextflow/NextFlowController.java b/nextflow/src/org/labkey/nextflow/NextFlowController.java
index a1c1e987..47aa61bd 100644
--- a/nextflow/src/org/labkey/nextflow/NextFlowController.java
+++ b/nextflow/src/org/labkey/nextflow/NextFlowController.java
@@ -23,14 +23,14 @@
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.SiteAdminPermission;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Path;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.HtmlView;
 import org.labkey.api.view.JspView;
@@ -209,8 +209,8 @@ public ModelAndView getView(EnabledForm form, boolean reshow, BindException erro
                                         getContainer().isRoot() ?
                                                 "Unset" :
                                                 "Inherited from " + getContainer().getParent().getPath() + " (currently " + (NextFlowManager.get().isEnabled(getContainer().getParent()) ? "enabled" : "disabled") + ")"),
-                                new Button.ButtonBuilder("Save").submit(true).build(), " ",
-                                new Button.ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
+                                new ButtonBuilder("Save").submit(true).build(), " ",
+                                new ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
             }
             else
             {
@@ -293,9 +293,9 @@ public ModelAndView getView(AnalyzeForm o, boolean b, BindException errors)
                                         "Files: ",
                                         UL(Arrays.stream(inputFiles).map(File::getName).map(DOM::LI)),
                                         "Config: ",
-                                        new Select.SelectBuilder().name("configFile").addOptions(Arrays.stream(configFiles).filter(f -> f.isFile() && f.getName().toLowerCase().endsWith(".config")).map(File::getName).sorted(String.CASE_INSENSITIVE_ORDER).toList()).build(),
+                                        new SelectBuilder().name("configFile").addOptions(Arrays.stream(configFiles).filter(f -> f.isFile() && f.getName().toLowerCase().endsWith(".config")).map(File::getName).sorted(String.CASE_INSENSITIVE_ORDER).toList()).build(),
                                         DOM.BR(),
-                                        new Button.ButtonBuilder("Start NextFlow").submit(true).build())));
+                                        new ButtonBuilder("Start NextFlow").submit(true).build())));
                     }
                 }
             }
diff --git a/nextflow/src/org/labkey/nextflow/nextFlowConfiguration.jsp b/nextflow/src/org/labkey/nextflow/nextFlowConfiguration.jsp
index f2f738b6..5287d450 100644
--- a/nextflow/src/org/labkey/nextflow/nextFlowConfiguration.jsp
+++ b/nextflow/src/org/labkey/nextflow/nextFlowConfiguration.jsp
@@ -1,10 +1,10 @@
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
-<%@ page import="org.labkey.api.view.HttpView" %>
-<%@ page import="org.labkey.nextflow.NextFlowConfiguration" %>
-<%@ page import="org.labkey.api.util.Button" %>
-<%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page import="org.labkey.api.admin.AdminUrls" %>
 <%@ page import="org.labkey.api.security.permissions.AdminOperationsPermission" %>
+<%@ page import="org.labkey.api.util.ButtonBuilder" %>
+<%@ page import="org.labkey.api.util.PageFlowUtil" %>
+<%@ page import="org.labkey.api.view.HttpView" %>
+<%@ page import="org.labkey.nextflow.NextFlowConfiguration" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
     NextFlowConfiguration form = (NextFlowConfiguration) HttpView.currentModel();
@@ -38,9 +38,9 @@
         <td><labkey:input type="password" name="apiKey" id="apiKeyInput" size="64" placeholder='<%= form.getApiKey() != null ? "value already set, overwrite to replace" : "" %>' /></td>
     </tr>
 </table>
-    <%= new Button.ButtonBuilder("Save").submit(true).primary(true).enabled(hasAdminOpsPerms) %>
-    <%= new Button.ButtonBuilder("Delete").onClick("deleteConfig()").enabled(hasAdminOpsPerms) %>
-    <%= new Button.ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL()) %>
+    <%= new ButtonBuilder("Save").submit(true).primary(true).enabled(hasAdminOpsPerms) %>
+    <%= new ButtonBuilder("Delete").onClick("deleteConfig()").enabled(hasAdminOpsPerms) %>
+    <%= new ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL()) %>
 </labkey:form>
 
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
index dda469ba..fe64c505 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
@@ -47,8 +47,6 @@
 import org.labkey.api.attachments.AttachmentParent;
 import org.labkey.api.attachments.BaseDownloadAction;
 import org.labkey.api.attachments.ByteArrayAttachmentFile;
-import org.labkey.api.audit.AuditLogService;
-import org.labkey.api.audit.provider.GroupAuditProvider;
 import org.labkey.api.data.ActionButton;
 import org.labkey.api.data.BeanViewForm;
 import org.labkey.api.data.ButtonBar;
@@ -124,12 +122,12 @@
 import org.labkey.api.targetedms.ITargetedMSRun;
 import org.labkey.api.targetedms.TargetedMSService;
 import org.labkey.api.targetedms.TargetedMSUrls;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.TestContext;
@@ -296,7 +294,7 @@ public ModelAndView getView(Object o, BindException errors)
                             LI("Creates a new security group for project administrators"),
                             LI("Creates an entry in the Journal table of the panoramapublic schema")
                     ),
-                    DIV(new Link.LinkBuilder("Create a new journal group").href(new ActionURL(CreateJournalGroupAction.class, getContainer())))
+                    DIV(new LinkBuilder("Create a new journal group").href(new ActionURL(CreateJournalGroupAction.class, getContainer())))
             )));
 
             view.addView(qView);
@@ -313,21 +311,21 @@ private ModelAndView getPXCredentialsLink()
         {
             ActionURL url = new ActionURL(ManageProteomeXchangeCredentials.class, getContainer());
             return new HtmlView(DIV(at(style, "margin-top:20px;"),
-                    new Link.LinkBuilder("Set ProteomeXchange Credentials").href(url).build()));
+                    new LinkBuilder("Set ProteomeXchange Credentials").href(url).build()));
         }
 
         private ModelAndView getDataCiteCredentialsLink()
         {
             ActionURL url = new ActionURL(ManageDataCiteCredentials.class, getContainer());
             return new HtmlView(DIV(at(style, "margin-top:20px;"),
-                    new Link.LinkBuilder("Set DataCite Credentials").href(url).build()));
+                    new LinkBuilder("Set DataCite Credentials").href(url).build()));
         }
 
         private ModelAndView getPanoramaPublicCatalogSettingsLink()
         {
             ActionURL url = new ActionURL(ManageCatalogEntrySettings.class, getContainer());
             return new HtmlView(DIV(at(style, "margin-top:20px;"),
-                    new Link.LinkBuilder("Panorama Public Catalog Settings").href(url).build()));
+                    new LinkBuilder("Panorama Public Catalog Settings").href(url).build()));
         }
 
         private ModelAndView getPostSupportMessageLink()
@@ -337,7 +335,7 @@ private ModelAndView getPostSupportMessageLink()
             {
                 ActionURL url = new ActionURL(CreatePanoramaPublicMessageAction.class, panoramaPublic.getProject());
                 return new HtmlView(DIV(at(style, "margin-top:20px;"),
-                        new Link.LinkBuilder("Post to Panorama Public Support Messages").href(url).build()));
+                        new LinkBuilder("Post to Panorama Public Support Messages").href(url).build()));
             }
             return null;
         }
@@ -725,8 +723,8 @@ public ModelAndView getView(JournalSupportContainerForm form, boolean reshow, Bi
                                 SPAN(cl("labkey-form-label"), "Support Container Path"),
                                 INPUT(at(type, "Text", name, "supportContainerPath", value, form.getSupportContainerPath())),
                                 BR(),
-                                new Button.ButtonBuilder("Save").submit(true).build(),
-                                new Button.ButtonBuilder("Cancel").submit(false).href(getJournalGroupDetailsUrl(_journal.getId(), getContainer())).build()
+                                new ButtonBuilder("Save").submit(true).build(),
+                                new ButtonBuilder("Cancel").submit(false).href(getJournalGroupDetailsUrl(_journal.getId(), getContainer())).build()
                             )
                     )
             ));
@@ -853,8 +851,8 @@ public ModelAndView getView(PublicDataUseForm form, boolean reshow, BindExceptio
                                     SPAN(cl("labkey-form-label"), "User Password"),
                                     INPUT(at(type, "Text", name, "userPassword", value, "")),
                                     BR(),
-                                    new Button.ButtonBuilder("Save").submit(true).build(),
-                                    new Button.ButtonBuilder("Cancel").submit(false).href(getJournalGroupDetailsUrl(_journal.getId(), getContainer())).build()
+                                    new ButtonBuilder("Save").submit(true).build(),
+                                    new ButtonBuilder("Cancel").submit(false).href(getJournalGroupDetailsUrl(_journal.getId(), getContainer())).build()
                             )
                     )
             );
@@ -997,7 +995,7 @@ public ModelAndView getSuccessView(DataCiteCredentialsForm form)
             return new HtmlView(
                     DIV("DataCite credentials saved!",
                     BR(),
-                    new Link.LinkBuilder("Back to Panorama Public Admin Console").href(adminUrl).build()));
+                    new LinkBuilder("Back to Panorama Public Admin Console").href(adminUrl).build()));
         }
 
         @Override
@@ -1144,7 +1142,7 @@ public ModelAndView getSuccessView(PXCredentialsForm form)
             return new HtmlView(
                     DIV("ProteomeXchange credentials saved!",
                     BR(),
-                    new Link.LinkBuilder("Back to Panorama Public Admin Console").href(adminUrl).build()));
+                    new LinkBuilder("Back to Panorama Public Admin Console").href(adminUrl).build()));
         }
 
         @Override
@@ -1251,8 +1249,8 @@ public ModelAndView getView(ManageCatalogEntryForm form, boolean reshow, BindExc
                                     TD(INPUT(at(type, "Text", name, "maxEntries", value, form.getMaxEntries())))
                             )
                         )),
-                            new Button.ButtonBuilder("Save").submit(true).build(),
-                            new Button.ButtonBuilder("Cancel").submit(false).href(new ActionURL(PanoramaPublicAdminViewAction.class, getContainer())).build()
+                            new ButtonBuilder("Save").submit(true).build(),
+                            new ButtonBuilder("Cancel").submit(false).href(new ActionURL(PanoramaPublicAdminViewAction.class, getContainer())).build()
                     )
                 )
             );
@@ -1316,7 +1314,7 @@ public ModelAndView getSuccessView(ManageCatalogEntryForm form)
             return new HtmlView(
                     DIV("Panorama Public catalog entry settings were saved.",
                             BR(),
-                            new Link.LinkBuilder("Back to Panorama Public Admin Console").href(adminUrl).build()));
+                            new LinkBuilder("Back to Panorama Public Admin Console").href(adminUrl).build()));
         }
 
         @Override
@@ -1919,7 +1917,7 @@ else if (!incompleteSubmission && validation.getStatus().incompleteSubmission())
     public static HtmlView getStartDataValidationView(String message, ExperimentAnnotations experimentAnnotations, Container container)
     {
         var url = new ActionURL(DataValidationCheckAction.class, container).addParameter("id", experimentAnnotations.getId());
-        return new HtmlView(DIV(DIV(at(style, "margin-bottom:15px;"), message), new Button.ButtonBuilder("Validate Data").href(url).build()));
+        return new HtmlView(DIV(DIV(at(style, "margin-bottom:15px;"), message), new ButtonBuilder("Validate Data").href(url).build()));
     }
 
     // ------------------------------------------------------------------------
@@ -2205,7 +2203,7 @@ private HtmlView getConfirmIncludeSubfoldersView(ExperimentAnnotations expAnnota
                     .addReturnUrl(skipSubfolderCheckUrl);
             HtmlView confirmView = new HtmlView(DIV("Would you like to include data from the following subfolders in the experiment?",
                     getSubfolderListHtml(expAnnotations.getContainer(), allSubfolders),
-                    new Button.ButtonBuilder("Include Subfolders and Continue").href(includeSubfoldersUrl).usePost().build(),
+                    new ButtonBuilder("Include Subfolders and Continue").href(includeSubfoldersUrl).usePost().build(),
                     HtmlString.NBSP,
                     getSkipSubfoldersAndContinueButton(skipSubfolderCheckUrl)));
 
@@ -2242,15 +2240,15 @@ private ModelAndView getExperimentIncludesHiddenFoldersView(ExperimentAnnotation
         }
 
         @NotNull
-        private Button getBackToFolderButton(Container container)
+        private ButtonBuilder.Button getBackToFolderButton(Container container)
         {
-            return new Button.ButtonBuilder("Back to Folder").href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(container)).build();
+            return new ButtonBuilder("Back to Folder").href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(container)).build();
         }
 
         @NotNull
-        private Button getSkipSubfoldersAndContinueButton(ActionURL skipSubfolderCheckUrl)
+        private ButtonBuilder.Button getSkipSubfoldersAndContinueButton(ActionURL skipSubfolderCheckUrl)
         {
-            return new Button.ButtonBuilder("Skip Subfolders and Continue").href(skipSubfolderCheckUrl).build();
+            return new ButtonBuilder("Skip Subfolders and Continue").href(skipSubfolderCheckUrl).build();
         }
 
         private HtmlView getAccountInfoIncompleteView(BindException errors)
@@ -2552,7 +2550,7 @@ public ModelAndView getSuccessView(PublishExperimentForm form)
                     DIV(dataPrivate),
                     DIV(pxdAssigned),
                     BR(), BR(),
-                    new Link.LinkBuilder("Back to Experiment Details").href(returnUrl).build()));
+                    new LinkBuilder("Back to Experiment Details").href(returnUrl).build()));
 
             view.setTitle(getSuccessViewTitle());
             return view;
@@ -2632,9 +2630,9 @@ private static HtmlView getStartValidationView(@Nullable DOM.Renderable message,
         {
             ActionURL noPxSubmissionUrl = submitUrl.clone().replaceParameter("getPxid", "false");
             componentList.add(DIV(at(style, "margin-bottom:10px;"), "If you do not want a ProteomeXchange ID click the link to ",
-                    new Link.LinkBuilder("Submit without a ProteomeXchange ID").href(noPxSubmissionUrl).build()));
+                    new LinkBuilder("Submit without a ProteomeXchange ID").href(noPxSubmissionUrl).build()));
         }
-        componentList.add(DIV(at(style, "top-bottom:10px;"), new Button.ButtonBuilder("Back to Experiment Details")
+        componentList.add(DIV(at(style, "top-bottom:10px;"), new ButtonBuilder("Back to Experiment Details")
                 .href(getViewExperimentDetailsURL(experimentAnnotations.getId(), container)).build()));
         HtmlView view = new HtmlView(DIV(componentList));
         view.setTitle("Data Validation For ProteomeXchange");
@@ -2642,32 +2640,32 @@ private static HtmlView getStartValidationView(@Nullable DOM.Renderable message,
         return view;
     }
 
-    private static Button.ButtonBuilder getStartDataValidationButton(ExperimentAnnotations expAnnotations, Container container)
+    private static ButtonBuilder getStartDataValidationButton(ExperimentAnnotations expAnnotations, Container container)
     {
         return getStartDataValidationButton("Start Data Validation", expAnnotations, container);
     }
 
-    private static Button.ButtonBuilder getRerunDataValidationButton(ExperimentAnnotations expAnnotations, Container container)
+    private static ButtonBuilder getRerunDataValidationButton(ExperimentAnnotations expAnnotations, Container container)
     {
         return getStartDataValidationButton("Rerun Validation", expAnnotations, container);
     }
 
-    private static Button.ButtonBuilder getStartDataValidationButton(String buttonText, ExperimentAnnotations expAnnotations, Container container)
+    private static ButtonBuilder getStartDataValidationButton(String buttonText, ExperimentAnnotations expAnnotations, Container container)
     {
         return getStartDataValidationButton(expAnnotations, container,
                 buttonText,
                 "Are you sure you want to start data validation?", true);
     }
 
-    private static Button.ButtonBuilder getStartDataValidationButton(ExperimentAnnotations expAnnotations, Container container,
-                                                                     String buttonText, String confirmMessage, boolean forSubmit)
+    private static ButtonBuilder getStartDataValidationButton(ExperimentAnnotations expAnnotations, Container container,
+                                                              String buttonText, String confirmMessage, boolean forSubmit)
     {
         var validateDataUrl = getSubmitPxValidationJobUrl(expAnnotations, container);
         if (!forSubmit)
         {
             validateDataUrl.addParameter("forSubmit", false);
         }
-        return new Button.ButtonBuilder(buttonText).href(validateDataUrl).usePost(confirmMessage);
+        return new ButtonBuilder(buttonText).href(validateDataUrl).usePost(confirmMessage);
     }
 
     @NotNull
@@ -2686,7 +2684,7 @@ private static HtmlView getDataValidationIncompleteView(DataValidation dataValid
             else
             {
                 return new HtmlView(DIV("Validation job is not complete.", BR(),
-                        new Button.ButtonBuilder("View Validation Status")
+                        new ButtonBuilder("View Validation Status")
                                 .href(getPxValidationStatusUrlNotForSubmit(dataValidation.getExperimentAnnotationsId(), dataValidation.getId(), container))
                                 .build()));
             }
@@ -2699,7 +2697,7 @@ private static HtmlView getDataValidationIncompleteView(DataValidation dataValid
                     "Data validation with Id " + dataValidation.getId() + " is incomplete.",
                     pipelineJobStatus != null ?
                             SPAN("The status of the pipeline job (Id: " + dataValidation.getJobId() + ") is ",
-                                    new Link.LinkBuilder(pipelineJobStatus.getStatus()).href(jobDetailsUrl).build())
+                                    new LinkBuilder(pipelineJobStatus.getStatus()).href(jobDetailsUrl).build())
                             : " The pipeline job (Id: " + dataValidation.getJobId() + ") may have been deleted."),
                     forSubmit, experimentAnnotations, container, null);
         }
@@ -2722,14 +2720,14 @@ private static DOM.Renderable getSubfolderListHtml(Container parent, List<Contai
     {
         return UL(children.stream()
                 .filter(child -> !child.equals(parent))
-                .map(child -> LI(new Link.LinkBuilder(parent.getParsedPath().relativize(child.getParsedPath()).toString())
+                .map(child -> LI(new LinkBuilder(parent.getParsedPath().relativize(child.getParsedPath()).toString())
                         .href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(child))
                         .clearClasses())));
     }
 
-    private static Button.ButtonBuilder getExcludeSubfoldersButton(ExperimentAnnotations exptAnnotations)
+    private static ButtonBuilder getExcludeSubfoldersButton(ExperimentAnnotations exptAnnotations)
     {
-        return new Button.ButtonBuilder("Exclude Subfolders")
+        return new ButtonBuilder("Exclude Subfolders")
                 .href(new ActionURL(ExcludeSubFoldersInExperimentAction.class, exptAnnotations.getContainer()).addParameter("id", exptAnnotations.getId()))
                 .usePost();
     }
@@ -3473,18 +3471,18 @@ private static HtmlView getValidationSummary(Status status, ExperimentAnnotation
         User createdByUser = UserManager.getUser(validation.getCreatedBy());
         ActionURL validationDetailsUrl = getPxValidationStatusUrl(exptAnnotations.getId(), validation.getId(), container);
         return new HtmlView(TABLE(cl("lk-fields-table"),
-                displayExperimentTitle ? row("Experiment: ", DIV(exptAnnotations.getTitle(), HtmlString.NBSP, new Link.LinkBuilder("View Details")
+                displayExperimentTitle ? row("Experiment: ", DIV(exptAnnotations.getTitle(), HtmlString.NBSP, new LinkBuilder("View Details")
                         .href(getViewExperimentDetailsURL(exptAnnotations.getId(), container)).build())) : HtmlString.EMPTY_STRING,
                 row("Last Validation Date: ", validation.getFormattedDate()),
                 createdByUser != null ?
-                        row("Created By: ", new Link.LinkBuilder(createdByUser.getDisplayName(user))
+                        row("Created By: ", new LinkBuilder(createdByUser.getDisplayName(user))
                                 .href(PageFlowUtil.urlProvider(UserUrls.class).getUserDetailsURL(container, createdByUser.getUserId(), null))
                                 .clearClasses().build()) :
                         row("Created By: ", "Unknown User " + validation.getCreatedBy()),
                 row("ProteomeXchange Status:", SPAN(getValidationStatusForSummary(validation, statusFile, exptAnnotations, user),
-                        HtmlString.NBSP, new Link.LinkBuilder("[Details]").href(validationDetailsUrl).build())),
+                        HtmlString.NBSP, new LinkBuilder("[Details]").href(validationDetailsUrl).build())),
                 row("Validation Log:", statusFile != null ?
-                        new Link.LinkBuilder("View log").href(PageFlowUtil.urlProvider(PipelineStatusUrls.class)
+                        new LinkBuilder("View log").href(PageFlowUtil.urlProvider(PipelineStatusUrls.class)
                                 .urlDetails(container, validation.getJobId())).build()
                         : SPAN("Log file not found for job Id " + validation.getJobId()))
         ));
@@ -4121,7 +4119,7 @@ protected WebPartView getPublishFormView(PublishExperimentForm form, ExperimentA
             {
                 return new HtmlView(DIV("Data is valid for a ProteomeXchange submission.",
                         BR(),
-                        new Button.ButtonBuilder("View Validation Details")
+                        new ButtonBuilder("View Validation Details")
                                 .href(getPxValidationStatusUrlNotForSubmit(_experimentAnnotations.getId(), _dataValidation.getId(), getContainer()))
                                 .build())
                 );
@@ -4329,7 +4327,7 @@ public ModelAndView getSuccessView(PxActionsForm form)
                         SPAN("Response from PX server: "), BR(),
                         DIV(at(style, "white-space: pre-wrap;margin:10px 0px 10px 0px;"),
                             _pxResponse),
-                    DIV(new Link.LinkBuilder("Back to folder").href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_expAnnot.getContainer())))));
+                    DIV(new LinkBuilder("Back to folder").href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_expAnnot.getContainer())))));
         }
 
         private PxXml createPxXml(ExperimentAnnotations expAnnot, JournalExperiment je, Submission submission, Status validationStatus, String pxChanageLog, boolean submittingToPx) throws PxException
@@ -4834,25 +4832,25 @@ public ModelAndView getView(ExperimentIdForm form, BindException errors)
                     INPUT(at(type, "hidden", name, "id", value, _expAnnot.getId())),
                     INPUT(at(type, "Text", name, "doi", value, _expAnnot.getDoi())),
                     SPAN(at(style, "margin:5px;")),
-                    new Button.ButtonBuilder("Submit").submit(true).build()));
+                    new ButtonBuilder("Submit").submit(true).build()));
 
             if(_expAnnot.hasDoi())
             {
                 return new HtmlView(
                         DIV(DIV(at(style, "margin-bottom:10px;"), "DOI assigned to the data is " + _expAnnot.getDoi()),
                                 DIV(
-                                new Link.LinkBuilder("Publish DOI").clearClasses().addClass("btn btn-default").href(new ActionURL(PublishDoiAction.class, getContainer()).addParameter("id", _expAnnot.getId())),
+                                new LinkBuilder("Publish DOI").clearClasses().addClass("btn btn-default").href(new ActionURL(PublishDoiAction.class, getContainer()).addParameter("id", _expAnnot.getId())),
                                 SPAN(at(style, "margin:5px;")),
-                                new Link.LinkBuilder("Delete DOI").clearClasses().addClass("btn btn-default").href(new ActionURL(DeleteDoiAction.class, getContainer()).addParameter("id", _expAnnot.getId()))),
+                                new LinkBuilder("Delete DOI").clearClasses().addClass("btn btn-default").href(new ActionURL(DeleteDoiAction.class, getContainer()).addParameter("id", _expAnnot.getId()))),
                                 updateDoiForm));
 
             }
             else
             {
                return new HtmlView(
-                       DIV(DIV(new Link.LinkBuilder("Assign New DOI").clearClasses().addClass("btn btn-default").href(getAssignDoiUrl(_expAnnot, getContainer(), false)),
+                       DIV(DIV(new LinkBuilder("Assign New DOI").clearClasses().addClass("btn btn-default").href(getAssignDoiUrl(_expAnnot, getContainer(), false)),
                        SPAN(at(style, "margin:5px;")),
-                       new Link.LinkBuilder("Assign New Test DOI").clearClasses().addClass("btn btn-default").href(getAssignDoiUrl(_expAnnot, getContainer(), true))),
+                       new LinkBuilder("Assign New Test DOI").clearClasses().addClass("btn btn-default").href(getAssignDoiUrl(_expAnnot, getContainer(), true))),
                        updateDoiForm));
             }
         }
@@ -4945,7 +4943,7 @@ public ModelAndView getSuccessView(DoiForm form)
             return new HtmlView(
                     DIV(getSuccessMessage(),
                             BR(),
-                            DIV(new Link.LinkBuilder("Back to folder").href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_expAnnot.getContainer())))));
+                            DIV(new LinkBuilder("Back to folder").href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_expAnnot.getContainer())))));
         }
 
         protected abstract DOM.Renderable getSuccessMessage();
@@ -5481,11 +5479,11 @@ public ModelAndView getView(final ViewExperimentAnnotationsForm form, BindExcept
             {
                 HtmlView details = getValidationSummary(DataValidationManager.getStatus(latestValidation, getUser()), exptAnnotations, false, getContainer(), getUser());
                 VBox view = new VBox(details);
-                Link viewAllLink = null;
+                LinkBuilder.Link viewAllLink = null;
                 if (getViewContext().hasPermission(AdminOperationsPermission.class) && DataValidationManager.getValidationJobCount(exptAnnotations.getId()) > 1)
                 {
                     ActionURL url = new ActionURL(ViewPxValidationsAction.class, getContainer()).addParameter("id", exptAnnotations.getId());
-                    viewAllLink = new Link.LinkBuilder("View All Validation Jobs").href(url).build();
+                    viewAllLink = new LinkBuilder("View All Validation Jobs").href(url).build();
                 }
                 view.addView(new HtmlView(DIV(at(style, "margin-top:15px;"),
                         getRerunDataValidationButton(exptAnnotations, getContainer()),
@@ -5520,7 +5518,7 @@ else if(children.size() > 0)
                 subfoldersView = new HtmlView(DIV("This folder contains " + children.size() + " subfolders. " +
                                 "Data from the subfolders is not included in this experiment. Click the button below to include subfolders.",
                     BR(),
-                    new Button.ButtonBuilder("Include Subfolders")
+                    new ButtonBuilder("Include Subfolders")
                             .usePost()
                             .href(new ActionURL(IncludeSubFoldersInExperimentAction.class, getContainer()).addParameter("id", exptAnnotations.getId()))
                             .build()));
@@ -5593,7 +5591,7 @@ else if(children.size() > 0)
 
                 ActionURL url = PanoramaPublicController.getDataValidationCheckUrl(exptAnnotations.getId(), exptAnnotations.getContainer(), true);
                 url.addReturnUrl(getViewExperimentDetailsURL(exptAnnotations.getId(), exptAnnotations.getContainer()));
-                vBox.addView(new HtmlView(DIV(new Link.LinkBuilder("Validate for ProteomeXchange").href(url).build())));
+                vBox.addView(new HtmlView(DIV(new LinkBuilder("Validate for ProteomeXchange").href(url).build())));
 
                 result.addView(vBox);
             }
@@ -6136,7 +6134,7 @@ public ModelAndView getView(ExperimentForm form, boolean reshow, BindException e
             if (_expAnnot != null)
             {
                 VBox view = new VBox(new SimpleErrorView(errors, false));
-                view.addView(new HtmlView(DIV(BR(), BR(), new Button.ButtonBuilder("Back to Folder")
+                view.addView(new HtmlView(DIV(BR(), BR(), new ButtonBuilder("Back to Folder")
                         .href(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_expAnnot.getContainer())))));
                 return view;
             }
@@ -6642,9 +6640,9 @@ private boolean canAddCatalogEntry(ExperimentAnnotations expAnnot)
             return CatalogEntryManager.getCatalogEntrySettings().isEnabled() && CatalogEntryManager.getEntryForExperiment(expAnnot) == null;
         }
 
-        private Button getAddCatalogEntryButton(ExperimentAnnotations expAnnot)
+        private ButtonBuilder.Button getAddCatalogEntryButton(ExperimentAnnotations expAnnot)
         {
-            return new Button.ButtonBuilder("Add Catalog Entry")
+            return new ButtonBuilder("Add Catalog Entry")
                     .href(getAddCatalogEntryUrl(expAnnot)).style("margin-left: 10px").build();
         }
 
@@ -7365,7 +7363,7 @@ private ModelAndView getLibrarySummary(SpecLibForm form, SpectralLibrary library
             rows.add(getSummaryRow("Name:", library.getName()));
             rows.add(getSummaryRow("File Name: ", SPAN(library.getFileNameHint(),
                     SPAN(at(style, "margin-left:5px; white-space: nowrap;"), library.getDownloadLink(getUser())))));
-            rows.add(getSummaryRow("Skyline Document: ",  new Link.LinkBuilder(run.getFileName())
+            rows.add(getSummaryRow("Skyline Document: ",  new LinkBuilder(run.getFileName())
                     .href(PageFlowUtil.urlProvider(TargetedMSUrls.class).getShowRunUrl(run.getContainer(), run.getId()))
                     .clearClasses().build()));
 
@@ -7426,9 +7424,9 @@ private ModelAndView getLibrarySummary(SpecLibForm form, SpectralLibrary library
                 ActionURL viewExperimentUrl = getViewExperimentDetailsURL(expAnnotations.getId(), expAnnotations.getContainer());
                 String linkText = specLibInfo != null ? "Edit Library Details" : "Add Library Details";
                 rows.add(TR(TD(at(colspan, 2), DIV(at(style, "margin-top: 10px;"),
-                        new Button.ButtonBuilder(linkText).href(editSpecLibUrl).build(),
+                        new ButtonBuilder(linkText).href(editSpecLibUrl).build(),
                         HtmlString.NBSP,
-                        new Button.ButtonBuilder("Experiment Details").href(viewExperimentUrl).build()))));
+                        new ButtonBuilder("Experiment Details").href(viewExperimentUrl).build()))));
             }
             HtmlView view = new HtmlView(TABLE(cl("lk-fields-table"), rows));
             view.setTitle("Summary");
@@ -7690,7 +7688,7 @@ private static HtmlView getErrorsView(BindException errors, ExperimentAnnotation
         return new HtmlView(
                 DIV(
                         ERRORS(errors),
-                        DIV(at(style, "margin-top:20px;)"), new Button.ButtonBuilder(buttonText).href(returnUrl))
+                        DIV(at(style, "margin-top:20px;)"), new ButtonBuilder(buttonText).href(returnUrl))
                 ));
     }
 
@@ -7940,12 +7938,12 @@ public ModelAndView getView(UnimodMatchForm form, BindException errors) throws E
             var view = new HtmlView(DIV(at(style, "margin:20px;"),
                     DIV(at(style, "margin:15px;"),
                             SPAN(at(style, "margin-right: 10px;"),"Find a"),
-                            SPAN(new Button.ButtonBuilder("Unimod Match").href(findMatchUrl).build()),
+                            SPAN(new ButtonBuilder("Unimod Match").href(findMatchUrl).build()),
                             SPAN(at(style, "margin-left: 10px;"), "for modification ", B(modification.getName()))),
                     DIV(at(style, "margin:15px;"), "OR"),
                     DIV(at(style, "margin:15px;"),
                             SPAN(at(style, "margin-right:10px;"), "Define a custom"),
-                            SPAN(new Button.ButtonBuilder("Combination Modification").href(comboModUrl).build()))));
+                            SPAN(new ButtonBuilder("Combination Modification").href(comboModUrl).build()))));
             view.setTitle("Unimod Match Options");
             view.setFrame(WebPartView.FrameType.PORTAL);
             return view;
@@ -8220,8 +8218,8 @@ private static HtmlView getModInfoChangedSuccessView(String modificationName, St
                 SPAN(" was successfully " + action + ".")),
                 BR(),
                 DIV("View all the structural and isotope modifications in the experiment: ",
-                        new Button.ButtonBuilder("View Experiment Modifications").href(exptModsUrl).build()),
-                DIV(new Link.LinkBuilder("[View Experiment Details]").href(getViewExperimentDetailsURL(expAnnotations.getId(), expAnnotations.getContainer())).build()
+                        new ButtonBuilder("View Experiment Modifications").href(exptModsUrl).build()),
+                DIV(new LinkBuilder("[View Experiment Details]").href(getViewExperimentDetailsURL(expAnnotations.getId(), expAnnotations.getContainer())).build()
                 )));
         return hView;
     }
@@ -8377,7 +8375,7 @@ public ModelAndView getView(final ExperimentIdForm form, BindException errors)
             VBox result = new VBox();
 
             result.addView(new HtmlView(DIV(at(style, "margin: 10px 0 20px 0;"),
-                    new Button.ButtonBuilder("View Experiment Details").href(getViewExperimentDetailsURL(exptAnnotations.getId(), getContainer())).build()))
+                    new ButtonBuilder("View Experiment Details").href(getViewExperimentDetailsURL(exptAnnotations.getId(), getContainer())).build()))
             );
 
             if (hasStructuralMods(svc, runs))
@@ -8485,7 +8483,7 @@ public ModelAndView getView(ExperimentIdForm form, BindException errors) throws
                     DIV(at(style, "margin:15px;"),
                             getRerunDataValidationButton(expAnnotations, expAnnotations.getContainer()),
                             SPAN(at(style, "margin:10x;"), HtmlString.NBSP),
-                            new Button.ButtonBuilder("Cancel").href(form.getReturnActionURL(getViewExperimentDetailsURL(expAnnotations.getId(), expAnnotations.getContainer()))))));
+                            new ButtonBuilder("Cancel").href(form.getReturnActionURL(getViewExperimentDetailsURL(expAnnotations.getId(), expAnnotations.getContainer()))))));
 
             VBox view = new VBox();
             String fileRootString = FileContentService.FILES_LINK + "/" + RAW_FILES_DIR + "/";
@@ -8710,23 +8708,23 @@ public URLHelper getSuccessURL(CatalogEntryForm form)
         @Override
         public ModelAndView getSuccessView(CatalogEntryForm form)
         {
-            Button backBtn;
+            ButtonBuilder.Button backBtn;
             if (form.getReturnActionURL() != null)
             {
-                backBtn = new Button.ButtonBuilder("Back").href(form.getReturnActionURL()).build();
+                backBtn = new ButtonBuilder("Back").href(form.getReturnActionURL()).build();
             }
             else
             {
-                backBtn = new Button.ButtonBuilder("Back to folder")
+                backBtn = new ButtonBuilder("Back to folder")
                                 .href(PageFlowUtil.urlProvider(ProjectUrls.class)
                                 .getBeginURL(_expAnnot.getContainer())).build();
             }
-            Button viewEntryButton = null;
+            ButtonBuilder.Button viewEntryButton = null;
             CatalogEntry entry = CatalogEntryManager.getEntryForExperiment(_expAnnot);
             if (entry != null)
             {
                 ActionURL url = PanoramaPublicController.getViewCatalogEntryUrl(_expAnnot, entry);
-                viewEntryButton = new Button.ButtonBuilder("View Entry").href(url).build();
+                viewEntryButton = new ButtonBuilder("View Entry").href(url).build();
             }
             return new HtmlView(
                     DIV("Thank you for submitting your entry for the Panorama Public data catalog. " +
diff --git a/panoramapublic/src/org/labkey/panoramapublic/datacite/DataCiteService.java b/panoramapublic/src/org/labkey/panoramapublic/datacite/DataCiteService.java
index 4f20fece..b57ce7db 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/datacite/DataCiteService.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/datacite/DataCiteService.java
@@ -7,7 +7,7 @@
 import org.json.JSONObject;
 import org.labkey.api.data.PropertyManager;
 import org.labkey.api.data.PropertyManager.WritablePropertyMap;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.panoramapublic.model.ExperimentAnnotations;
 
 import java.io.DataOutputStream;
@@ -247,11 +247,11 @@ public static String toUrl(@NotNull String doi)
         return "https://doi.org/" + doi;
     }
 
-    public static Link.LinkBuilder toLink(@NotNull String doi)
+    public static LinkBuilder toLink(@NotNull String doi)
     {
         // Display the complete link: https://support.datacite.org/docs/datacite-doi-display-guidelines
         String url = toUrl(doi);
-        return new Link.LinkBuilder(url).href(url).rel("noopener noreferrer");
+        return new LinkBuilder(url).href(url).rel("noopener noreferrer");
     }
 
     /**
diff --git a/panoramapublic/src/org/labkey/panoramapublic/model/DataLicense.java b/panoramapublic/src/org/labkey/panoramapublic/model/DataLicense.java
index b7216736..c7a3f9a5 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/model/DataLicense.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/model/DataLicense.java
@@ -5,7 +5,7 @@
 import org.labkey.api.data.JdbcType;
 import org.labkey.api.data.Parameter;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 
 public enum DataLicense implements Parameter.JdbcParameterValue
 {
@@ -31,9 +31,9 @@ public String getUrl()
         return _url;
     }
 
-    public Link getDisplayLink()
+    public LinkBuilder.Link getDisplayLink()
     {
-        return new Link.LinkBuilder(getDisplayName()).href(getUrl()).target("_blank").clearClasses().build();
+        return new LinkBuilder(getDisplayName()).href(getUrl()).target("_blank").clearClasses().build();
     }
 
     public HtmlString getDisplayLinkHtml()
diff --git a/panoramapublic/src/org/labkey/panoramapublic/model/speclib/SpectralLibrary.java b/panoramapublic/src/org/labkey/panoramapublic/model/speclib/SpectralLibrary.java
index b55e55c5..41ea943f 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/model/speclib/SpectralLibrary.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/model/speclib/SpectralLibrary.java
@@ -14,7 +14,7 @@
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.webdav.WebdavService;
@@ -170,7 +170,7 @@ private void initLibPath(User user)
             return SPAN(cl("labkey-error"), "Run not found");
         }
         var runUrl = PageFlowUtil.urlProvider(TargetedMSUrls.class).getShowRunUrl(_run.getContainer(), _run.getId());
-        return new Link.LinkBuilder(_run.getFileName()).href(runUrl).clearClasses().build();
+        return new LinkBuilder(_run.getFileName()).href(runUrl).clearClasses().build();
     }
 
     public @NotNull DOM.Renderable getViewLibInfoAndDownloadLink(@NotNull User user, @NotNull Map<String, String> viewSpecLibParams)
@@ -184,7 +184,7 @@ private DOM.Renderable getViewLibInfoLink(@NotNull Map<String, String> viewSpecL
         var viewSpecLibAction = new ActionURL(PanoramaPublicController.ViewSpecLibAction.class, _run.getContainer());
         viewSpecLibAction.addParameter("specLibId", getId());
         viewSpecLibParams.forEach(viewSpecLibAction::replaceParameter);
-        return new Link.LinkBuilder("Library").href(viewSpecLibAction).tooltip("View library details").build();
+        return new LinkBuilder("Library").href(viewSpecLibAction).tooltip("View library details").build();
     }
 
     @NotNull
@@ -201,9 +201,9 @@ public DOM.Renderable getDownloadLink(@NotNull User user)
                 {
                     var displaySize = FileUtils.byteCountToDisplaySize(_fileSize);
                     return SPAN(
-                            new Link.LinkBuilder().href(webdavUrl).iconCls("fa fa-download").build(),
+                            new LinkBuilder().href(webdavUrl).iconCls("fa fa-download").build(),
                             HtmlString.NBSP,
-                            new Link.LinkBuilder(displaySize)
+                            new LinkBuilder(displaySize)
                                     .href(webdavUrl)
                                     .tooltip("Download library file included in the Skyline document")
                                     .clearClasses().build()
diff --git a/panoramapublic/src/org/labkey/panoramapublic/proteomexchange/UnimodModification.java b/panoramapublic/src/org/labkey/panoramapublic/proteomexchange/UnimodModification.java
index bc57b337..7cca4135 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/proteomexchange/UnimodModification.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/proteomexchange/UnimodModification.java
@@ -18,7 +18,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.w3c.dom.NodeList;
 
 import java.util.Collections;
@@ -305,19 +305,19 @@ public String getTerminus()
         return terminus;
     }
 
-    public Link getLink()
+    public LinkBuilder.Link getLink()
     {
        return getLink(_id);
     }
 
-    public static Link getLink(int unimodId)
+    public static LinkBuilder.Link getLink(int unimodId)
     {
         return getLink(unimodId, false);
     }
 
-    public static Link getLink(int unimodId, boolean clearMargin)
+    public static LinkBuilder.Link getLink(int unimodId, boolean clearMargin)
     {
-        var link = new Link.LinkBuilder("UNIMOD:" + unimodId)
+        var link = new LinkBuilder("UNIMOD:" + unimodId)
                 .href("https://www.unimod.org/modifications_view.php?editid1=" + unimodId)
                 .target("_blank")
                 .rel("noopener noreferrer");
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/CatalogEntryTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/CatalogEntryTableInfo.java
index df4e7037..22420cab 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/CatalogEntryTableInfo.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/CatalogEntryTableInfo.java
@@ -9,7 +9,7 @@
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.query.QueryForeignKey;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.ShortURLRecord;
@@ -68,7 +68,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 if (viewCatalogEntryUrl instanceof ActionURL url)
                 {
                     url.addReturnUrl(ctx.getViewContext().getActionURL());
-                    var viewButton = new Button.ButtonBuilder("View").href(url).build();
+                    var viewButton = new ButtonBuilder("View").href(url).build();
                     viewButton.appendTo(out);
                     return;
                 }
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
index 9f04bc68..cc5562c0 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
@@ -59,12 +59,12 @@
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.JavaScriptFragment;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.SimpleNamedObject;
 import org.labkey.api.util.StringExpressionFactory;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.template.ClientDependency;
@@ -216,7 +216,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
 
                 if (accessUrl != null)
                 {
-                    var link = new Link.LinkBuilder("Share")
+                    var link = new LinkBuilder("Share")
                         .clearClasses().addClass("button-small button-small-green")
                         .style("margin:0px 5px 0px 2px;")
                         .onClick("showShareLink(this, " + PageFlowUtil.jsString(accessUrl) + ");return false;");
@@ -728,8 +728,7 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
 
             DIV(
                 at(style, "margin-top:5px;").id(renderId).cl("scrollable-dropdown-menu"),
-                new InputBuilder<>()
-                    .type("text")
+                InputBuilder.text()
                     .className("tags")
                     .placeholder(_placeholderText)
                     .name(name)
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/PeptideMatchesDisplayColumnFactory.java b/panoramapublic/src/org/labkey/panoramapublic/query/PeptideMatchesDisplayColumnFactory.java
index e5582de5..cce9471a 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/PeptideMatchesDisplayColumnFactory.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/PeptideMatchesDisplayColumnFactory.java
@@ -8,7 +8,7 @@
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
@@ -47,7 +47,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 searchUrl.addParameter("peptideSequence", proteinLabel);
                 searchUrl.addParameter("exactMatch", exactMatch);
 
-                out.write(new Link.LinkBuilder(String.valueOf(matches)).href(searchUrl));
+                out.write(new LinkBuilder(String.valueOf(matches)).href(searchUrl));
                 out.write(PageFlowUtil.button("View").href(searchUrl));
             }
         };
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/ProteinMatchesDisplayColumnFactory.java b/panoramapublic/src/org/labkey/panoramapublic/query/ProteinMatchesDisplayColumnFactory.java
index 3821717e..32ac6eea 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/ProteinMatchesDisplayColumnFactory.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/ProteinMatchesDisplayColumnFactory.java
@@ -8,7 +8,7 @@
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
@@ -47,7 +47,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 searchUrl.addParameter("proteinLabel", proteinLabel);
                 searchUrl.addParameter("exactMatch", exactMatch);
 
-                out.write(new Link.LinkBuilder(String.valueOf(matches)).href(searchUrl));
+                out.write(new LinkBuilder(String.valueOf(matches)).href(searchUrl));
                 out.write(PageFlowUtil.button("View").href(searchUrl));
             }
         };
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/SmallMoleculesMatchesDisplayColumnFactory.java b/panoramapublic/src/org/labkey/panoramapublic/query/SmallMoleculesMatchesDisplayColumnFactory.java
index ba06932b..87888eab 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/SmallMoleculesMatchesDisplayColumnFactory.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/SmallMoleculesMatchesDisplayColumnFactory.java
@@ -8,7 +8,7 @@
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
@@ -47,7 +47,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 searchUrl.addParameter("smallMolecule", smallMol);
                 searchUrl.addParameter("exactMatch", exactMatch);
 
-                out.write(new Link.LinkBuilder(String.valueOf(matches)).href(searchUrl));
+                out.write(new LinkBuilder(String.valueOf(matches)).href(searchUrl));
                 out.write(PageFlowUtil.button("View").href(searchUrl));
             }
         };
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/modification/ModificationDocsDisplayColumnFactory.java b/panoramapublic/src/org/labkey/panoramapublic/query/modification/ModificationDocsDisplayColumnFactory.java
index 2112e4c4..bca9195e 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/modification/ModificationDocsDisplayColumnFactory.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/modification/ModificationDocsDisplayColumnFactory.java
@@ -16,7 +16,7 @@
 import org.labkey.api.targetedms.TargetedMSUrls;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.panoramapublic.PanoramaPublicSchema;
@@ -105,7 +105,7 @@ private List<ITargetedMSRun> getRuns(Collection<Long> runIds, User user)
     private @NotNull DOM.Renderable runLink(@NotNull ITargetedMSRun run)
     {
         var runUrl = PageFlowUtil.urlProvider(TargetedMSUrls.class).getShowRunUrl(run.getContainer(), run.getId());
-        return new Link.LinkBuilder(run.getFileName()).href(runUrl).clearClasses().build();
+        return new LinkBuilder(run.getFileName()).href(runUrl).clearClasses().build();
     }
 
     private @NotNull DOM.Renderable peptidesLink(ITargetedMSRun run, Long modId)
@@ -114,7 +114,7 @@ private List<ITargetedMSRun> getRuns(Collection<Long> runIds, User user)
         var peptidesLink = PageFlowUtil.urlProvider(QueryUrls.class).urlExecuteQuery(run.getContainer(), PanoramaPublicSchema.SCHEMA_NAME, query);
         peptidesLink.addParameter(getRunIdQueryParam(), run.getId());
         peptidesLink.addParameter(getModIdQueryParam(), modId);
-        return new Link.LinkBuilder("[PEPTIDES]").href(peptidesLink).build();
+        return new LinkBuilder("[PEPTIDES]").href(peptidesLink).build();
     }
 
     public static class StructuralModDocsColumn extends ModificationDocsDisplayColumnFactory
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/modification/UnimodMatchDisplayColumnFactory.java b/panoramapublic/src/org/labkey/panoramapublic/query/modification/UnimodMatchDisplayColumnFactory.java
index a60698e4..f8c9fefa 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/query/modification/UnimodMatchDisplayColumnFactory.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/query/modification/UnimodMatchDisplayColumnFactory.java
@@ -12,7 +12,7 @@
 import org.labkey.api.targetedms.TargetedMSService;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.panoramapublic.PanoramaPublicController;
@@ -70,7 +70,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
 
                         String deleteLinkText = "Delete Match" + (modInfo.getUnimodInfos().size() > 1 ? "es" : "");
                         DIV(getAssignedUnimodDetails(modInfo),
-                                SPAN(at(style, "margin-left:8px;"), new Link.LinkBuilder(deleteLinkText)
+                                SPAN(at(style, "margin-left:8px;"), new LinkBuilder(deleteLinkText)
                                         .href(deleteUrl)
                                         .usePost(String.format("Are you sure you want to delete the saved Unimod information for modification '%s'?",
                                                 dbMod != null ? dbMod.getName() : ""))
@@ -91,7 +91,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     {
                         var url = getMatchToUnimodAction(ctx).addParameter("id", exptId).addParameter("modificationId", modId);
                         url.addCancelURL(ctx.getViewContext().getActionURL());
-                        var findMatchLink = new Link.LinkBuilder("Find Match").href(url);
+                        var findMatchLink = new LinkBuilder("Find Match").href(url);
                         DIV(SPAN(at(style, "color: #d70101; font-weight: bold; margin-right:5px;"), "MISSING"),
                                 findMatchLink).appendTo(out);
                     }
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/TargetedMSExperimentWebPart.java b/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/TargetedMSExperimentWebPart.java
index f78f6866..4df65982 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/TargetedMSExperimentWebPart.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/expannotations/TargetedMSExperimentWebPart.java
@@ -18,7 +18,7 @@
 import org.labkey.api.data.Container;
 import org.labkey.api.portal.ProjectUrls;
 import org.labkey.api.security.permissions.AdminOperationsPermission;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HtmlView;
@@ -64,7 +64,7 @@ public TargetedMSExperimentWebPart(ExperimentAnnotations expAnnotations, ViewCon
             HtmlView view = new HtmlView(DIV(
                     DIV("This folder does not contain an experiment."),
                     DIV(at(style, "margin-top:20px;"),
-                            new Link.LinkBuilder("Create New Experiment")
+                            new LinkBuilder("Create New Experiment")
                                     .href(new ActionURL(PanoramaPublicController.ShowNewExperimentAnnotationFormAction.class, container))
                                     .build())));
             addView(view);
@@ -118,7 +118,7 @@ else if(expAnnotations.getContainer().equals(container))
             HtmlView view = new HtmlView(DIV(
                     DIV("A parent folder contains an experiment that includes data in this folder."),
                     DIV(at(style, "margin-top: 20px;"),
-                            new Link.LinkBuilder("View Experiment Details")
+                            new LinkBuilder("View Experiment Details")
                                     .href(PanoramaPublicController.getViewExperimentDetailsURL(expAnnotations.getId(), container))
                                     .build() )
             ));
diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/publish/CatalogEntryWebPart.java b/panoramapublic/src/org/labkey/panoramapublic/view/publish/CatalogEntryWebPart.java
index 807ec121..7aa2a3b5 100644
--- a/panoramapublic/src/org/labkey/panoramapublic/view/publish/CatalogEntryWebPart.java
+++ b/panoramapublic/src/org/labkey/panoramapublic/view/publish/CatalogEntryWebPart.java
@@ -4,7 +4,7 @@
 import org.labkey.api.data.Container;
 import org.labkey.api.security.User;
 import org.labkey.api.security.permissions.AdminPermission;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.view.ActionURL;
@@ -54,13 +54,13 @@ public CatalogEntryWebPart(ExperimentAnnotations expAnnotations, User user, @Nul
             addView(new HtmlView(DIV("This dataset does not have an entry in the Panorama Public data catalog. " +
                             "Click the button below to add an entry.",
                     BR(),
-                    new Button.ButtonBuilder("Add Catalog Entry").href(PanoramaPublicController.getAddCatalogEntryUrl(expAnnotations)
+                    new ButtonBuilder("Add Catalog Entry").href(PanoramaPublicController.getAddCatalogEntryUrl(expAnnotations)
                             .addReturnUrl(getViewContext().getActionURL()))
             )));
         }
         else
         {
-            Button changeStatusBtn = null;
+            ButtonBuilder.Button changeStatusBtn = null;
             if (user.hasSiteAdminPermission())
             {
                 changeStatusBtn = changeStatusButtonBuilder(entry.getApproved(), expAnnotations.getId(), entry.getId(), container)
@@ -102,11 +102,11 @@ public CatalogEntryWebPart(ExperimentAnnotations expAnnotations, User user, @Nul
                     DIV(IMG(at(src, PanoramaPublicController.getCatalogImageDownloadUrl(expAnnotations, entry.getImageFileName()))
                             .at(width, settings.getImgWidth()).at(height, settings.getImgHeight())
                             .at(style, "margin:10px 0 15px 0;border: 1px solid lightgrey;"))),
-                    new Button.ButtonBuilder("Edit").href(editUrl),
+                    new ButtonBuilder("Edit").href(editUrl),
                     HtmlString.NBSP,
-                    new Button.ButtonBuilder("Delete").href(deleteUrl)
+                    new ButtonBuilder("Delete").href(deleteUrl)
                             .usePost("Are you sure you want to delete the Panorama Public catalog entry for this experiment?"),
-                    returnUrl != null ? DIV(at(style, "margin-top:25px;"), new Button.ButtonBuilder("Back").href(returnUrl))
+                    returnUrl != null ? DIV(at(style, "margin-top:25px;"), new ButtonBuilder("Back").href(returnUrl))
                                       : HtmlString.EMPTY_STRING
             )));
         }
@@ -121,11 +121,11 @@ public static boolean canBeDisplayed(ExperimentAnnotations expAnnotations, User
                 && ExperimentAnnotationsManager.isCurrentVersion(expAnnotations);
     }
 
-    public static Button.ButtonBuilder changeStatusButtonBuilder(Boolean status, int expAnnotationsId, int catalogEntryId, Container container)
+    public static ButtonBuilder changeStatusButtonBuilder(Boolean status, int expAnnotationsId, int catalogEntryId, Container container)
     {
         boolean approve = status == null || !status;
         String btnTxt = approve ? "Approve" : "Reject";
-        return new Button.ButtonBuilder(btnTxt).href(
+        return new ButtonBuilder(btnTxt).href(
                         new ActionURL(PanoramaPublicController.ChangeCatalogEntryStateAction.class, container)
                                 .addParameter("id", expAnnotationsId)
                                 .addParameter("catalogEntryId", catalogEntryId)
diff --git a/pwebdashboard/src/org/labkey/pwebdashboard/ProjectAdminsTable.java b/pwebdashboard/src/org/labkey/pwebdashboard/ProjectAdminsTable.java
index d5d360f1..8b3fdba2 100644
--- a/pwebdashboard/src/org/labkey/pwebdashboard/ProjectAdminsTable.java
+++ b/pwebdashboard/src/org/labkey/pwebdashboard/ProjectAdminsTable.java
@@ -32,7 +32,7 @@
 import org.labkey.api.security.roles.SiteAdminRole;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
@@ -218,7 +218,7 @@ else if (pType.equals(PrincipalType.GROUP))
         private HtmlString getUserDetails(Container container, UserPrincipal member)
         {
             ActionURL url = PageFlowUtil.urlProvider(UserUrls.class).getUserDetailsURL(container, member.getUserId(), null);
-            return new Link.LinkBuilder(member.getName()).href(url).clearClasses().build().getHtmlString();
+            return new LinkBuilder(member.getName()).href(url).clearClasses().build().getHtmlString();
         }
 
         @Override
diff --git a/signup/src/org/labkey/signup/SignUpController.java b/signup/src/org/labkey/signup/SignUpController.java
index f4c5749a..78597865 100644
--- a/signup/src/org/labkey/signup/SignUpController.java
+++ b/signup/src/org/labkey/signup/SignUpController.java
@@ -53,11 +53,11 @@
 import org.labkey.api.security.ValidEmail;
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.settings.LookAndFeelProperties;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HtmlView;
 import org.labkey.api.view.HttpView;
@@ -361,8 +361,8 @@ public ModelAndView getView(SignupConfirmForm form, boolean reshow, BindExceptio
                            TD(INPUT(at(type, "password", name, "password2", value, form.getPassword2()))))
                     ),
                     DIV(at(style, "margin-top:10px"),
-                            new Button.ButtonBuilder("Submit").submit(true).style("margin-right:10px").build(),
-                            new Button.ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(ProjectUrls.class).getHomeURL()).build()
+                            new ButtonBuilder("Submit").submit(true).style("margin-right:10px").build(),
+                            new ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(ProjectUrls.class).getHomeURL()).build()
                     )
                 )
             ));