diff --git a/announcements/src/org/labkey/announcements/AnnouncementsController.java b/announcements/src/org/labkey/announcements/AnnouncementsController.java
index 661fd56952c..a720e61e4ab 100644
--- a/announcements/src/org/labkey/announcements/AnnouncementsController.java
+++ b/announcements/src/org/labkey/announcements/AnnouncementsController.java
@@ -109,8 +109,8 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.AjaxCompletion;
 import org.labkey.api.view.AlwaysAvailableWebPartFactory;
diff --git a/announcements/src/org/labkey/announcements/announcementThread.jsp b/announcements/src/org/labkey/announcements/announcementThread.jsp
index 5ac9e302ffe..78ddd926c94 100644
--- a/announcements/src/org/labkey/announcements/announcementThread.jsp
+++ b/announcements/src/org/labkey/announcements/announcementThread.jsp
@@ -74,7 +74,7 @@ if (announcementModel.isSpam())
 }
 else if (null == announcementModel.getApproved() && c.hasPermission(user, AdminPermission.class))
 {
-    %><p></p><img src="<%=getWebappURL("_images/exclaim.gif")%>">&nbsp;This <%=h(settings.getConversationName().toLowerCase())%> requires <%=link("moderator review", new ActionURL(AnnouncementsController.ModeratorReviewAction.class, c)).clearClasses()%>.<%
+    %><p></p><img src="<%=getWebappURL("_images/exclaim.gif")%>">&nbsp;This <%=h(settings.getConversationName().toLowerCase())%> requires <%=simpleLink("moderator review", new ActionURL(AnnouncementsController.ModeratorReviewAction.class, c))%>.<%
 }
 %>
 
diff --git a/api/src/org/labkey/api/action/LabKeyErrorWithLink.java b/api/src/org/labkey/api/action/LabKeyErrorWithLink.java
index 086a99ebe5a..98d18f53bf8 100644
--- a/api/src/org/labkey/api/action/LabKeyErrorWithLink.java
+++ b/api/src/org/labkey/api/action/LabKeyErrorWithLink.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ViewContext;
 
 public class LabKeyErrorWithLink extends LabKeyError
diff --git a/api/src/org/labkey/api/assay/AssayQCFlagColumn.java b/api/src/org/labkey/api/assay/AssayQCFlagColumn.java
index d4f39807530..09b3dac4581 100644
--- a/api/src/org/labkey/api/assay/AssayQCFlagColumn.java
+++ b/api/src/org/labkey/api/assay/AssayQCFlagColumn.java
@@ -32,7 +32,7 @@
 import org.labkey.api.query.ExprColumn;
 import org.labkey.api.query.FieldKey;
 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.view.template.ClientDependency;
@@ -99,7 +99,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
 
                             // add onclick handler to call the QCFlag toggle window creation function
                             // users with update perm will be able to change enabled state and edit comment, others will only be able to read flag details
-                            Link.LinkBuilder linkBuilder = new Link.LinkBuilder(getCollapsedQCFlagOutput(values, enabled))
+                            LinkBuilder linkBuilder = new LinkBuilder(getCollapsedQCFlagOutput(values, enabled))
                                     .onClick("showQCFlagToggleWindow(" + jsString(_schemaName) + ", " + runId + "," + _editable + "); return false;");
                             oldWriter.write(linkBuilder.toString());
                         }
diff --git a/api/src/org/labkey/api/assay/actions/UploadWizardAction.java b/api/src/org/labkey/api/assay/actions/UploadWizardAction.java
index f96c9ed1268..ca03044d0a0 100644
--- a/api/src/org/labkey/api/assay/actions/UploadWizardAction.java
+++ b/api/src/org/labkey/api/assay/actions/UploadWizardAction.java
@@ -76,11 +76,11 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 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.Pair;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HtmlView;
 import org.labkey.api.view.HttpView;
@@ -902,7 +902,7 @@ public boolean isEditable()
         @Override
         public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
         {
-            out.write(new Input.InputBuilder<>().type("text").name(_inputName).value(value == null ? null : value.toString()));
+            out.write(InputBuilder.text().name(_inputName).value(value == null ? null : value.toString()));
         }
 
         @Override
@@ -1213,7 +1213,7 @@ public HtmlString getErrors(String paramName)
                 {
                     sb.append("<br>");
                     String script = "uploadWizard_showPopup('extraErrors', 'All Errors', " + PageFlowUtil.jsString(msgBox.toString()) + "); return false;";
-                    sb.append(new Link.LinkBuilder("Too many errors to display (click to show all).").id("extraErrors").onClick(script).getHtmlString());
+                    sb.append(new LinkBuilder("Too many errors to display (click to show all).").id("extraErrors").onClick(script).getHtmlString());
                     sb.append("<br>");
                 }
                 return sb.getHtmlString();
diff --git a/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java b/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
index 55ec297375b..088b506bef7 100644
--- a/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
+++ b/api/src/org/labkey/api/data/AbstractFileDisplayColumn.java
@@ -23,7 +23,7 @@
 import org.labkey.api.util.MimeMap;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringExpression;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -273,11 +273,10 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
             String filename = getFileName(ctx, value);
             String formFieldName = ctx.getForm().getFormFieldName(getBoundColumn());
 
-            InputBuilder<?> input = new InputBuilder<>()
-                    .type("file")
-                    .name(formFieldName)
-                    .disabled(isDisabledInput(ctx))
-                    .needsWrapping(false);
+            InputBuilder<?> input = InputBuilder.file()
+                .name(formFieldName)
+                .disabled(isDisabledInput(ctx))
+                .needsWrapping(false);
 
             if (null != filename)
             {
diff --git a/api/src/org/labkey/api/data/ActionButton.java b/api/src/org/labkey/api/data/ActionButton.java
index 9ece1a85375..d39839d6c57 100644
--- a/api/src/org/labkey/api/data/ActionButton.java
+++ b/api/src/org/labkey/api/data/ActionButton.java
@@ -21,7 +21,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.query.DetailsURL;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.JavaScriptFragment;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringExpression;
@@ -377,7 +377,7 @@ public void render(RenderContext ctx, Writer out) throws IOException
 
         lock();
 
-        Button.ButtonBuilder button = PageFlowUtil.button(getCaption(ctx))
+        ButtonBuilder button = PageFlowUtil.button(getCaption(ctx))
             .disableOnClick(_disableOnClick)
             .iconCls(getIconCls())
             .tooltip(getTooltip())
diff --git a/api/src/org/labkey/api/data/CrosstabDataRegion.java b/api/src/org/labkey/api/data/CrosstabDataRegion.java
index c8fda5034d4..0a1346fa687 100644
--- a/api/src/org/labkey/api/data/CrosstabDataRegion.java
+++ b/api/src/org/labkey/api/data/CrosstabDataRegion.java
@@ -19,7 +19,7 @@
 import org.labkey.api.query.CrosstabView;
 import org.labkey.api.util.DOM.Renderable;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.SafeToRender;
 import org.labkey.api.writer.HtmlWriter;
@@ -134,7 +134,7 @@ protected SafeToRender getMemberCaptionWithUrl(String caption, String url)
     {
         if (url != null)
         {
-            return new Link.LinkBuilder(caption).href(url);
+            return new LinkBuilder(caption).href(url);
         }
 
         return HtmlString.of(caption);
diff --git a/api/src/org/labkey/api/data/DataColumn.java b/api/src/org/labkey/api/data/DataColumn.java
index 4adbefe90dc..0a67b311026 100644
--- a/api/src/org/labkey/api/data/DataColumn.java
+++ b/api/src/org/labkey/api/data/DataColumn.java
@@ -38,18 +38,17 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 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.StringExpression;
 import org.labkey.api.util.StringExpressionFactory;
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.Input;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select;
-import org.labkey.api.util.element.TextArea;
+import org.labkey.api.util.InputBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
+import org.labkey.api.util.TextAreaBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.TypeAheadSelectDisplayColumn;
@@ -393,7 +392,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
 
             if (StringUtils.isNotBlank(url))
             {
-                Link.LinkBuilder link = new Link.LinkBuilder(formattedValue).href(url).clearClasses();
+                LinkBuilder link = new LinkBuilder(formattedValue).href(url).clearClasses();
 
                 String linkTitle = renderURLTitle(ctx);
                 if (null != linkTitle)
@@ -721,12 +720,12 @@ else if (_inputType.equalsIgnoreCase("checkbox"))
 
     private void renderSelectFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput, NamedObjectList entryList)
     {
-        Select.SelectBuilder select = new Select.SelectBuilder()
+        SelectBuilder select = new SelectBuilder()
             .disabled(disabledInput)
             .multiple("select.multiple".equalsIgnoreCase(_inputType))
             .name(formFieldName);
 
-        List<Option> options = new ArrayList<>();
+        List<OptionBuilder.Option> options = new ArrayList<>();
 
         // add empty option
         options.add(new OptionBuilder().build());
@@ -797,8 +796,7 @@ protected void renderSelectFormInputFromFk(RenderContext ctx, HtmlWriter out, St
 
     protected void renderFileFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
     {
-        var input = new Input.InputBuilder<>()
-            .type("file")
+        var input = InputBuilder.file()
             .name(formFieldName)
             .disabled(disabledInput)
             .needsWrapping(false);
@@ -810,8 +808,7 @@ protected void renderCheckboxFormInput(HtmlWriter out, String formFieldName, Obj
     {
         boolean checked = ColumnInfo.booleanFromObj(ConvertUtils.convert(value));
 
-        var input = new Input.InputBuilder<>()
-            .type("checkbox")
+        var input = InputBuilder.checkbox()
             .name(formFieldName)
             .disabled(disabledInput)
             .value("1")
@@ -828,8 +825,7 @@ protected void renderCheckboxFormInput(HtmlWriter out, String formFieldName, Obj
          * To fix this, each checkbox posts a hidden field named @columnName.  Spring parameter
          * binding uses these special fields to set all unposted checkbox values to false.
          */
-        out.write(new Input.InputBuilder<>()
-            .type("hidden")
+        out.write(InputBuilder.hidden()
             .name(SpringActionController.FIELD_MARKER + formFieldName)
             .value(1));
 
@@ -840,7 +836,7 @@ protected void renderCheckboxFormInput(HtmlWriter out, String formFieldName, Obj
 
     protected void renderTextAreaFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
     {
-        TextArea.TextAreaBuilder input = new TextArea.TextAreaBuilder()
+        TextAreaBuilder input = new TextAreaBuilder()
             .columns(_inputLength)
             .rows(_inputRows)
             .name(formFieldName)
@@ -856,7 +852,7 @@ protected void renderTextAreaFormInput(HtmlWriter out, String formFieldName, Obj
 
     protected void renderTextFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
     {
-        var input = new Input.InputBuilder<>()
+        var input = InputBuilder.text()
             .name(formFieldName)
             .disabled(disabledInput)
             .size(_inputLength)
diff --git a/api/src/org/labkey/api/data/DataRegion.java b/api/src/org/labkey/api/data/DataRegion.java
index 66281c75a61..d4d6155af6a 100644
--- a/api/src/org/labkey/api/data/DataRegion.java
+++ b/api/src/org/labkey/api/data/DataRegion.java
@@ -61,8 +61,8 @@
 import org.labkey.api.util.TestContext;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.CsrfInput;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.CsrfInput;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DisplayElement;
 import org.labkey.api.view.HttpView;
@@ -1811,19 +1811,19 @@ protected void renderFormBegin(RenderContext ctx, HtmlWriter out, int mode)
     protected void renderHiddenFormFields(RenderContext ctx, HtmlWriter out, int mode)
     {
         if (mode == MODE_GRID)
-            out.write(new InputBuilder<>().type("hidden").name(DataRegionSelection.DATA_REGION_SELECTION_KEY).value(getSelectionKey()));
+            out.write(InputBuilder.hidden().name(DataRegionSelection.DATA_REGION_SELECTION_KEY).value(getSelectionKey()));
 
         out.write(new CsrfInput(ctx.getViewContext()));
 
         for (FormField field : _hiddenFormFields)
         {
-            out.write(new InputBuilder<>().type("hidden").name(field.name()).value(field.value()));
+            out.write(InputBuilder.hidden().name(field.name()).value(field.value()));
         }
 
         if (mode == MODE_UPDATE_MULTIPLE)
         {
-            out.write(new InputBuilder<>().type("hidden").name(TableViewForm.DATA_SUBMIT_NAME).value("true"));
-            out.write(new InputBuilder<>().type("hidden").name(TableViewForm.BULK_UPDATE_NAME).value("true"));
+            out.write(InputBuilder.hidden().name(TableViewForm.DATA_SUBMIT_NAME).value("true"));
+            out.write(InputBuilder.hidden().name(TableViewForm.BULK_UPDATE_NAME).value("true"));
         }
     }
 
@@ -1848,8 +1848,7 @@ private void renderRecordSelector(RenderContext ctx, HtmlWriter out)
         boolean enabled = isRecordSelectorEnabled(ctx);
         boolean checked = isRecordSelectorChecked(ctx, checkboxValue);
 
-        new InputBuilder<>()
-            .type("checkbox")
+        InputBuilder.checkbox()
             .title("Select/unselect row")
             .name(getRecordSelectorName(ctx))
             .id(getRecordSelectorId(ctx))
@@ -2329,8 +2328,7 @@ private void renderForm(RenderContext ctx, HtmlWriter out)
                                         if (null != pkVal)
                                         {
                                             out.write(
-                                                new InputBuilder<>()
-                                                    .type("hidden")
+                                                InputBuilder.hidden()
                                                     .name(viewForm != null ? viewForm.getFormFieldName(pkCol) : pkColName)
                                                     .value(pkVal.toString())
                                             );
@@ -2515,8 +2513,7 @@ private HtmlWriter writeSameHeader(RenderContext ctx, HtmlWriter out, List<Displ
         TD(
             at(style, "white-space:nowrap;"),
             LABEL(cl("control-label"),
-                new InputBuilder<>()
-                    .type("checkbox")
+                InputBuilder.checkbox()
                     .id(madeId)
                     .name("~~SELECTALL~~")
                     .build(),
@@ -2572,7 +2569,7 @@ private void renderOldValues(HtmlWriter out, Map<String, Object> values)
         getTable().getPkColumnNames().forEach(name -> oldKeys.put(name, values.get(name)));
 
         out.write(
-            new InputBuilder<>().type("hidden").name(OLD_VALUES_NAME).value(new JSONObject(oldKeys).toString())
+            InputBuilder.hidden().name(OLD_VALUES_NAME).value(new JSONObject(oldKeys).toString())
         );
     }
 
diff --git a/api/src/org/labkey/api/data/DisplayColumn.java b/api/src/org/labkey/api/data/DisplayColumn.java
index 0a7f63981c1..abc66716cc2 100644
--- a/api/src/org/labkey/api/data/DisplayColumn.java
+++ b/api/src/org/labkey/api/data/DisplayColumn.java
@@ -36,7 +36,7 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.util.StringExpressionFactory;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
@@ -1163,9 +1163,8 @@ public String getFormFieldName(RenderContext ctx)
 
     protected void renderHiddenFormInput(HtmlWriter out, String formFieldName, Object value)
     {
-        out.write(new InputBuilder<>()
+        out.write(InputBuilder.hidden()
             .name(formFieldName)
-            .type("hidden")
             .value(null != value ? value.toString() : null));
     }
 
diff --git a/api/src/org/labkey/api/data/DisplayColumnGroup.java b/api/src/org/labkey/api/data/DisplayColumnGroup.java
index 34f8cd0a39a..5e8dc9d4331 100644
--- a/api/src/org/labkey/api/data/DisplayColumnGroup.java
+++ b/api/src/org/labkey/api/data/DisplayColumnGroup.java
@@ -17,7 +17,7 @@
 package org.labkey.api.data;
 
 import org.labkey.api.util.DOM;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -61,7 +61,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
             isCopyable() ? (DOM.Renderable) ret -> {
 
                 String id = getGroupFormFieldName(ctx) + "CheckBox";
-                new InputBuilder<>().type("checkbox").name(id).id(id).appendTo(out);
+                InputBuilder.checkbox().name(id).id(id).appendTo(out);
                 StringBuilder onChange = new StringBuilder("b = this.checked;");
 
                 // Index starts at 1 -- always leave the first column visible
diff --git a/api/src/org/labkey/api/data/JavaScriptDisplayColumn.java b/api/src/org/labkey/api/data/JavaScriptDisplayColumn.java
index 6df2c612cc7..d3badf02866 100644
--- a/api/src/org/labkey/api/data/JavaScriptDisplayColumn.java
+++ b/api/src/org/labkey/api/data/JavaScriptDisplayColumn.java
@@ -20,7 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.StringExpressionFactory;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.api.writer.HtmlWriter;
diff --git a/api/src/org/labkey/api/data/MVDisplayColumn.java b/api/src/org/labkey/api/data/MVDisplayColumn.java
index d3fa3aef0aa..22a9a48e848 100644
--- a/api/src/org/labkey/api/data/MVDisplayColumn.java
+++ b/api/src/org/labkey/api/data/MVDisplayColumn.java
@@ -20,7 +20,7 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.util.Set;
diff --git a/api/src/org/labkey/api/data/bigiron/AbstractClrInstallationManager.java b/api/src/org/labkey/api/data/bigiron/AbstractClrInstallationManager.java
index 6c9ea1f6f91..25bd23681ed 100644
--- a/api/src/org/labkey/api/data/bigiron/AbstractClrInstallationManager.java
+++ b/api/src/org/labkey/api/data/bigiron/AbstractClrInstallationManager.java
@@ -38,7 +38,7 @@
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.HelpTopic;
 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.util.Path;
 import org.labkey.api.view.ActionURL;
@@ -51,9 +51,6 @@
 /**
  * Base class for handling installation of CLR Assemblies on SQL Server. Most methods/logic
  * were abstracted from what used to be in GroupConcatInstallationManager.
- *
- * User: tgaluhn
- * Date: 1/13/2017
  */
 public abstract class AbstractClrInstallationManager
 {
@@ -205,7 +202,7 @@ protected void addAdminWarningMessage(Warnings warnings, String text, Class<? ex
     {
         ActionURL downloadURL = new ActionURL(downloadActionClass, ContainerManager.getRoot());
         HtmlStringBuilder builder = HtmlStringBuilder.of(text + " ");
-        builder.append(new Link.LinkBuilder("Download installation script.").href(downloadURL).clearClasses().getHtmlString());
+        builder.append(LinkBuilder.simpleLink("Download installation script.", downloadURL));
 
         if (null != helpTopic)
             builder.append(" ").append(new HelpTopic(helpTopic).getSimpleLinkHtml("View installation instructions."));
diff --git a/api/src/org/labkey/api/data/queryprofiler/QueryProfiler.java b/api/src/org/labkey/api/data/queryprofiler/QueryProfiler.java
index a064422334f..860218f16a9 100644
--- a/api/src/org/labkey/api/data/queryprofiler/QueryProfiler.java
+++ b/api/src/org/labkey/api/data/queryprofiler/QueryProfiler.java
@@ -40,7 +40,7 @@
 import org.labkey.api.util.Formats;
 import org.labkey.api.util.HashHelpers;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.LogPrintWriter;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.ShutdownListener;
@@ -410,9 +410,9 @@ public HttpView<?> getStackTraceView(final String sqlHash, final ActionURLFactor
                 Arrays.stream(ExecutionPlanType.values()).
                     filter(tracker::canShowExecutionPlan).
                     map(type -> DOM.DIV(
-                        new Link.LinkBuilder("Show " + type.getDescription()).
+                        new LinkBuilder("Show " + type.getDescription()).
                             href(executeFactory.getActionURL(tracker.getHash()).addParameter("type", type.name())).build(),
-                        ExecutionPlanType.Actual == type ? DOM.DIV(new Link.LinkBuilder("Log " + type.getDescription() + " to primary site log").
+                        ExecutionPlanType.Actual == type ? DOM.DIV(new LinkBuilder("Log " + type.getDescription() + " to primary site log").
                             href(executeFactory.getActionURL(tracker.getHash()).addParameter("type", type.name()).addParameter("log", true)).build()) : null
                     )),
                 DOM.BR(),
@@ -423,9 +423,9 @@ public HttpView<?> getStackTraceView(final String sqlHash, final ActionURLFactor
         }
     }
 
-    private Link copyToClipboardLink(String linkId, String targetId)
+    private LinkBuilder.Link copyToClipboardLink(String linkId, String targetId)
     {
-        return new Link.LinkBuilder("copy to clipboard").
+        return new LinkBuilder("copy to clipboard").
             onClick("return false;").
             id(linkId).
             attributes(Collections.singletonMap("data-clipboard-target", "#" + targetId)).
diff --git a/api/src/org/labkey/api/jsp/JspBase.java b/api/src/org/labkey/api/jsp/JspBase.java
index ca95954cde7..922b833e0c0 100644
--- a/api/src/org/labkey/api/jsp/JspBase.java
+++ b/api/src/org/labkey/api/jsp/JspBase.java
@@ -26,7 +26,7 @@
 import org.labkey.api.action.UrlProvider;
 import org.labkey.api.data.Container;
 import org.labkey.api.security.User;
-import org.labkey.api.util.Button.ButtonBuilder;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.DOM.Renderable;
 import org.labkey.api.util.DateUtil;
 import org.labkey.api.util.DemoMode;
@@ -34,14 +34,14 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JavaScriptFragment;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.PageFlowUtil.HelpPopupBuilder;
 import org.labkey.api.util.SafeToRender;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.Input.InputBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.InputBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.ViewContext;
@@ -473,6 +473,12 @@ public LinkBuilder link(Renderable html, @NotNull URLHelper url)
         return new LinkBuilder(html).href(url);
     }
 
+    // Simple, unstyled link
+    public LinkBuilder simpleLink(String text, @NotNull URLHelper url)
+    {
+        return LinkBuilder.simpleLink(text, url);
+    }
+
     public InputBuilder<?> input()
     {
         return new InputBuilder<>();
diff --git a/api/src/org/labkey/api/jsp/taglib/ButtonTag.java b/api/src/org/labkey/api/jsp/taglib/ButtonTag.java
index 71899836925..c599d551168 100644
--- a/api/src/org/labkey/api/jsp/taglib/ButtonTag.java
+++ b/api/src/org/labkey/api/jsp/taglib/ButtonTag.java
@@ -16,7 +16,7 @@
 
 package org.labkey.api.jsp.taglib;
 
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.URLHelper;
 
@@ -35,7 +35,7 @@ public class ButtonTag extends SimpleTagBase
     @Override
     public void doTag() throws IOException
     {
-        Button.ButtonBuilder button = PageFlowUtil.button(_text).id(_id);
+        ButtonBuilder button = PageFlowUtil.button(_text).id(_id);
 
         // TODO: This shouldn't have inconsistent logic from Button.java, should just be a pass through
         if (_href != null)
diff --git a/api/src/org/labkey/api/jsp/taglib/CheckboxTag.java b/api/src/org/labkey/api/jsp/taglib/CheckboxTag.java
index d7ac14fd025..49139c12cff 100644
--- a/api/src/org/labkey/api/jsp/taglib/CheckboxTag.java
+++ b/api/src/org/labkey/api/jsp/taglib/CheckboxTag.java
@@ -17,7 +17,7 @@
 package org.labkey.api.jsp.taglib;
 
 import org.labkey.api.action.SpringActionController;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 
 import java.io.IOException;
 
@@ -35,8 +35,7 @@ public class CheckboxTag extends SimpleTagBase
     public void doTag() throws IOException
     {
         // TODO: We need a CheckBoxBuilder
-        InputBuilder<?> checkbox = new InputBuilder<>()
-            .type("checkbox")
+        InputBuilder<?> checkbox = InputBuilder.checkbox()
             .id(_id)
             .name(_name)
             .value(_value);
@@ -52,8 +51,7 @@ public void doTag() throws IOException
 
         getOut().print(checkbox);
 
-        InputBuilder<?> springMarker = new InputBuilder<>()
-            .type("hidden")
+        InputBuilder<?> springMarker = InputBuilder.hidden()
             .name(SpringActionController.FIELD_MARKER + _name);
 
         getOut().print(springMarker);
diff --git a/api/src/org/labkey/api/jsp/taglib/CsrfInputTag.java b/api/src/org/labkey/api/jsp/taglib/CsrfInputTag.java
index 543ac441698..eac0e4be7cb 100644
--- a/api/src/org/labkey/api/jsp/taglib/CsrfInputTag.java
+++ b/api/src/org/labkey/api/jsp/taglib/CsrfInputTag.java
@@ -16,7 +16,7 @@
 
 package org.labkey.api.jsp.taglib;
 
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 
 import java.io.IOException;
 
diff --git a/api/src/org/labkey/api/jsp/taglib/FormTag.java b/api/src/org/labkey/api/jsp/taglib/FormTag.java
index e8b8a8643cf..43a4f2d8cc9 100644
--- a/api/src/org/labkey/api/jsp/taglib/FormTag.java
+++ b/api/src/org/labkey/api/jsp/taglib/FormTag.java
@@ -21,7 +21,7 @@
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.UnexpectedException;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.ViewContext;
@@ -198,8 +198,8 @@ public int doStartTag() throws JspException
         var form =
                 DOM.LK.FORM(formAttributes
                     .cl(isNotBlank(_class), _class)
-                    .cl(Input.Layout.HORIZONTAL.toString().equalsIgnoreCase(getLayout()), "form-horizontal")
-                    .cl(Input.Layout.INLINE.toString().equalsIgnoreCase(getLayout()), "form-inline"),
+                    .cl(InputBuilder.Input.Layout.HORIZONTAL.toString().equalsIgnoreCase(getLayout()), "form-horizontal")
+                    .cl(InputBuilder.Input.Layout.INLINE.toString().equalsIgnoreCase(getLayout()), "form-inline"),
                     DOM.BODY_PLACE_HOLDER);
         endTag = DOM.renderTemplate(form, pageContext.getOut());
 
diff --git a/api/src/org/labkey/api/jsp/taglib/InputTag.java b/api/src/org/labkey/api/jsp/taglib/InputTag.java
index 16b7537b4ee..7d20050ff40 100644
--- a/api/src/org/labkey/api/jsp/taglib/InputTag.java
+++ b/api/src/org/labkey/api/jsp/taglib/InputTag.java
@@ -18,9 +18,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.util.HasHtmlString;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.element.DisplayField;
-import org.labkey.api.util.element.Input;
-import org.labkey.api.util.element.TextArea;
+import org.labkey.api.util.DisplayFieldBuilder;
+import org.labkey.api.util.InputBuilder;
+import org.labkey.api.util.TextAreaBuilder;
 
 import java.io.IOException;
 
@@ -279,14 +279,14 @@ public void setMaxLength(Integer maxLength)
     @Override
     public void doTag() throws IOException
     {
-        Input.InputBuilder input;
+        InputBuilder<?> input;
 
         if ("textarea".equalsIgnoreCase(type))
-            input = new TextArea.TextAreaBuilder();
+            input = new TextAreaBuilder();
         else if ("displayfield".equalsIgnoreCase(type))
-            input = new DisplayField.DisplayFieldBuilder();
+            input = new DisplayFieldBuilder();
         else
-            input = new Input.InputBuilder<>().type(type);
+            input = new InputBuilder<>().type(type);
 
         if (null == forceSmallContext)
             forceSmallContext = false;
@@ -331,7 +331,7 @@ else if ("displayfield".equalsIgnoreCase(type))
             .checked(checked)
             .size(size)
             .maxLength(maxLength)
-            .state(Input.State.get(state))
+            .state(InputBuilder.Input.State.get(state))
             .autoComplete(autoComplete)
             .dirName(dirName)
             .form(form)
@@ -360,7 +360,7 @@ else if ("displayfield".equalsIgnoreCase(type))
             if (formGroup == null)
                 input.formGroup(true);
 
-            input.layout(Input.Layout.get(form.getLayout()));
+            input.layout(InputBuilder.Input.Layout.get(form.getLayout()));
         }
 
         getOut().print(input);
diff --git a/api/src/org/labkey/api/jsp/taglib/OptionsTag.java b/api/src/org/labkey/api/jsp/taglib/OptionsTag.java
index 3a3659814b2..d5b462a812a 100644
--- a/api/src/org/labkey/api/jsp/taglib/OptionsTag.java
+++ b/api/src/org/labkey/api/jsp/taglib/OptionsTag.java
@@ -16,7 +16,7 @@
 
 package org.labkey.api.jsp.taglib;
 
-import org.labkey.api.util.element.Option.OptionBuilder;
+import org.labkey.api.util.OptionBuilder;
 
 import jakarta.servlet.jsp.JspWriter;
 import java.io.IOException;
diff --git a/api/src/org/labkey/api/query/UserSchemaAction.java b/api/src/org/labkey/api/query/UserSchemaAction.java
index d3a10f0e51a..9bde5af49d1 100644
--- a/api/src/org/labkey/api/query/UserSchemaAction.java
+++ b/api/src/org/labkey/api/query/UserSchemaAction.java
@@ -31,7 +31,7 @@
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.NavTree;
@@ -115,7 +115,7 @@ protected ButtonBar createSubmitCancelButtonBar(QueryUpdateForm form)
 
         return bb.add(
             btnSubmit,
-            new Button.ButtonBuilder("Cancel").href(getCancelURL(form)).build()
+            new ButtonBuilder("Cancel").href(getCancelURL(form)).build()
         );
     }
 
diff --git a/api/src/org/labkey/api/security/AuthenticationManager.java b/api/src/org/labkey/api/security/AuthenticationManager.java
index 0eb98848ed5..df3e413805f 100644
--- a/api/src/org/labkey/api/security/AuthenticationManager.java
+++ b/api/src/org/labkey/api/security/AuthenticationManager.java
@@ -86,7 +86,7 @@
 import org.labkey.api.util.HeartBeat;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Rate;
 import org.labkey.api.util.RateLimiter;
diff --git a/api/src/org/labkey/api/security/SecurityManager.java b/api/src/org/labkey/api/security/SecurityManager.java
index fc4ae18feaf..6a2b631188f 100644
--- a/api/src/org/labkey/api/security/SecurityManager.java
+++ b/api/src/org/labkey/api/security/SecurityManager.java
@@ -101,7 +101,7 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JunitUtil;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.MailHelper;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
@@ -2365,13 +2365,13 @@ else if (sendMail)
             // Email failure message already includes link to the contents
             if (!emailFailure)
             {
-                LinkBuilder link = new LinkBuilder("here").href(messageContentsURL).target("_blank").clearClasses();
+                LinkBuilder link = LinkBuilder.simpleLink("here", messageContentsURL).target("_blank");
                 message.append(" Click ").append(link).append(" to see the email.");
             }
 
             if (!context.getContainer().isRoot())
             {
-                LinkBuilder projectGroupLink = new LinkBuilder("here").href(PageFlowUtil.urlProvider(SecurityUrls.class).getPermissionsURL(context.getContainer())).clearClasses();
+                LinkBuilder projectGroupLink = LinkBuilder.simpleLink("here", PageFlowUtil.urlProvider(SecurityUrls.class).getPermissionsURL(context.getContainer()));
                 message.append(" Add the new user to a Project Group ").append(projectGroupLink).append(".").append(HtmlString.BR).append(HtmlString.BR);
             }
         }
@@ -2446,7 +2446,7 @@ public static void appendAdminMailHelpHtml(HtmlStringBuilder builder, ActionURL
         if (messageContentsURL != null)
         {
             builder.append(" Alternatively, you can copy the ")
-                .append(new LinkBuilder("contents of the message").href(messageContentsURL).target("_blank").clearClasses())
+                .append(LinkBuilder.simpleLink("contents of the message", messageContentsURL).target("_blank"))
                 .append(" into an email client and send it to the user manually.");
         }
 
diff --git a/api/src/org/labkey/api/security/StrongPasswordValidator.java b/api/src/org/labkey/api/security/StrongPasswordValidator.java
index 9c6645ab9d9..5b5d28c1cfc 100644
--- a/api/src/org/labkey/api/security/StrongPasswordValidator.java
+++ b/api/src/org/labkey/api/security/StrongPasswordValidator.java
@@ -4,7 +4,7 @@
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 
 import java.util.Map;
diff --git a/api/src/org/labkey/api/security/UserManager.java b/api/src/org/labkey/api/security/UserManager.java
index 05f42f9816c..f3e89dc1025 100644
--- a/api/src/org/labkey/api/security/UserManager.java
+++ b/api/src/org/labkey/api/security/UserManager.java
@@ -64,7 +64,7 @@
 import org.labkey.api.security.roles.SiteAdminRole;
 import org.labkey.api.util.HeartBeat;
 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.StringUtilsLabKey;
@@ -1221,7 +1221,7 @@ public static HtmlString getUserDetailsHTMLLink(Container container, User curren
         // currentUser has permissions to see user details of the displayed user
         if (url != null)
         {
-            return new Link.LinkBuilder(displayName).href(url).clearClasses().getHtmlString();
+            return LinkBuilder.simpleLink(displayName, url).getHtmlString();
         }
 
         return HtmlString.of(displayName);
diff --git a/api/src/org/labkey/api/settings/LookAndFeelPropertiesManager.java b/api/src/org/labkey/api/settings/LookAndFeelPropertiesManager.java
index 376492c4bdb..47ce1adb87b 100644
--- a/api/src/org/labkey/api/settings/LookAndFeelPropertiesManager.java
+++ b/api/src/org/labkey/api/settings/LookAndFeelPropertiesManager.java
@@ -14,7 +14,7 @@
 import org.labkey.api.resource.Resource;
 import org.labkey.api.security.User;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.SafeToRenderEnum;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/api/src/org/labkey/api/settings/TemplateProperties.java b/api/src/org/labkey/api/settings/TemplateProperties.java
index b8a5b7bfb8b..43fbae36651 100644
--- a/api/src/org/labkey/api/settings/TemplateProperties.java
+++ b/api/src/org/labkey/api/settings/TemplateProperties.java
@@ -24,8 +24,7 @@
 import org.labkey.api.module.Module;
 import org.labkey.api.module.ModuleHtmlView;
 import org.labkey.api.module.ModuleLoader;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Option.OptionBuilder;
+import org.labkey.api.util.OptionBuilder;
 import org.labkey.api.view.HtmlView;
 import org.labkey.api.view.WebPartView;
 
@@ -214,7 +213,7 @@ private String getProperty(String propName, boolean inherit)
         return currentSetting;
     }
 
-    default List<Option> getOptions()
+    default List<OptionBuilder.Option> getOptions()
     {
         Map<String, String> modules = new LinkedHashMap<>();  // Keep the options in insertion order
 
diff --git a/api/src/org/labkey/api/study/actions/StudyPickerColumn.java b/api/src/org/labkey/api/study/actions/StudyPickerColumn.java
index 1cd82aad728..e6a991b0f02 100644
--- a/api/src/org/labkey/api/study/actions/StudyPickerColumn.java
+++ b/api/src/org/labkey/api/study/actions/StudyPickerColumn.java
@@ -29,9 +29,9 @@
 import org.labkey.api.util.DOM.Renderable;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Input;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.InputBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.util.Set;
@@ -127,7 +127,7 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
         out.write(select);
 
         if (disabled)
-            out.write(new Input.InputBuilder<>().type("hidden").name(_inputName).value(HtmlString.of(value)));
+            out.write(InputBuilder.hidden().name(_inputName).value(HtmlString.of(value)));
     }
 
     @Override
diff --git a/api/src/org/labkey/api/study/publish/publishChooseStudy.jsp b/api/src/org/labkey/api/study/publish/publishChooseStudy.jsp
index bc555be7252..026a8f9bbd2 100644
--- a/api/src/org/labkey/api/study/publish/publishChooseStudy.jsp
+++ b/api/src/org/labkey/api/study/publish/publishChooseStudy.jsp
@@ -26,11 +26,11 @@
 <%@ page import="org.labkey.api.study.publish.StudyPublishService" %>
 <%@ page import="org.labkey.api.util.HelpTopic" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
+<%@ page import="org.labkey.api.util.InputBuilder.Input" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.util.Pair" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.util.StringUtilsLabKey" %>
-<%@ page import="org.labkey.api.util.element.Input" %>
-<%@ page import="org.labkey.api.util.element.Option" %>
-<%@ page import="org.labkey.api.util.element.Select" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -60,7 +60,7 @@
     List<Pair<String, String>> parameters = postURL.getParameters();
     postURL.deleteParameters();
 
-    Select.SelectBuilder options = new Select.SelectBuilder().name("targetStudy").label("Choose target study")
+    SelectBuilder options = new SelectBuilder().name("targetStudy").label("Choose target study")
             .id("targetStudy")
             .layout(Input.Layout.HORIZONTAL)
             .formGroup(true);
@@ -68,7 +68,7 @@
     for (Study study : StudyPublishService.get().getValidPublishTargets(getUser(), InsertPermission.class))
     {
         String path = study.getContainer().getPath();
-        options.addOption(new Option.OptionBuilder()
+        options.addOption(new OptionBuilder()
                 .value(study.getContainer().getId())
                 .label(path + " (" + study.getLabel() + ")")
                 .selected(firstStudyContainer != null && firstStudyContainer.getPath().equals(path))
diff --git a/api/src/org/labkey/api/util/Button.java b/api/src/org/labkey/api/util/Button.java
deleted file mode 100644
index 3f8669c9eb3..00000000000
--- a/api/src/org/labkey/api/util/Button.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2014-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.labkey.api.data.RenderContext;
-import org.labkey.api.view.DisplayElement;
-import org.labkey.api.view.HttpView;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collections;
-import java.util.Map;
-
-import static org.labkey.api.util.DOM.A;
-import static org.labkey.api.util.DOM.Attribute;
-import static org.labkey.api.util.DOM.Attribute.tabindex;
-import static org.labkey.api.util.DOM.Attribute.title;
-import static org.labkey.api.util.DOM.Attribute.type;
-import static org.labkey.api.util.DOM.INPUT;
-import static org.labkey.api.util.DOM.LK.FA;
-import static org.labkey.api.util.DOM.SPAN;
-import static org.labkey.api.util.DOM.at;
-import static org.labkey.api.util.DOM.createHtmlFragment;
-
-
-/**
- * Basic button UI element. Might be a simple link, have a JavaScript handler, etc.
- * Testing of this class can be found in the Core module's TestController.ButtonAction
- */
-public class Button extends DisplayElement implements HasHtmlString, SafeToRender
-{
-    // Button constants
-    private static final String CLS = "labkey-button";
-    private static final String DISABLED_CLS = "labkey-disabled-button";
-    private static final String PRIMARY_CLS = "primary";
-
-    // Composable members
-    private final String cssClass;
-    private final String iconCls;
-    private final String caption; // required
-    private final String href;
-    private final String onClick;
-    private final String id;
-    private final Map<String, String> attributes;
-    private final String tooltip;
-    private final String typeCls;
-    private final boolean disableOnClick;
-    private final boolean dropdown;
-    private final boolean enabled;
-    private final boolean submit;
-    private final boolean usePost;
-    private final String rel;
-    private final String name;
-    private final String style;
-    private final String confirmMessage;
-    private final String target;
-
-    private Button(ButtonBuilder builder)
-    {
-        this.cssClass = builder.cssClass;
-        this.dropdown = builder.dropdown;
-        this.caption = builder.caption;
-        this.href = builder.href;
-        this.onClick = builder.onClick;
-        this.iconCls = builder.iconCls;
-        this.id = builder.id;
-        this.attributes = builder.attributes == null ? Collections.emptyMap() : builder.attributes;
-        this.disableOnClick = builder.disableOnClick;
-        this.enabled = builder.enabled;
-        this.submit = builder.submit;
-        this.tooltip = builder.tooltip;
-        this.typeCls = builder.typeCls;
-        this.usePost = builder.usePost;
-        this.rel = builder.rel;
-        this.name = builder.name;
-        this.style = builder.style;
-        this.confirmMessage = builder.confirmMessage;
-        this.target = builder.target;
-
-        if (this.usePost && null != this.onClick)
-            throw new IllegalStateException("Can't specify both usePost and onClick");
-    }
-
-    public String getCssClass()
-    {
-        return this.cssClass;
-    }
-
-    public String getTarget()
-    {
-        return target;
-    }
-
-    public boolean isDropdown()
-    {
-        return dropdown;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public String getRel()
-    {
-        return rel;
-    }
-
-    public String getOnClick()
-    {
-            return onClick;
-    }
-
-    public String getIconCls()
-    {
-        return iconCls;
-    }
-
-    public String getStyle()
-    {
-        return style;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-
-    public Map<String,String> getAttributes()
-    {
-        return attributes;
-    }
-
-    public boolean isDisableOnClick()
-    {
-        return disableOnClick;
-    }
-
-    public boolean isEnabled()
-    {
-        return enabled;
-    }
-
-    public boolean isSubmit()
-    {
-        return submit;
-    }
-
-    private @NotNull String generateOnClick()
-    {
-        // prepare onclick method and overrides
-        final String onClick = usePost ? PageFlowUtil.postOnClickJavaScriptEvent() : StringUtils.defaultString(getOnClick());
-
-        // we're modifying the javascript, so need to use whatever quoting the caller used
-        char quote = PageFlowUtil.getUsedQuoteSymbol(onClick);
-
-        // quoted CSS classes used in scripting
-        final String qDisabledCls = quote + DISABLED_CLS + quote;
-
-        // check if the disabled class is applied, if so, do nothing onclick
-        String onClickMethod = "if(this.className.indexOf(" + qDisabledCls + ")!=-1)return false;";
-
-        if (isDisableOnClick())
-        {
-            onClickMethod += "LABKEY.Utils.addClass(this," + qDisabledCls + ");";
-        }
-
-        if (isSubmit())
-        {
-            // Grab the id of a form element vial the data.submitid attribute on the button.  This is used to navigate to the form.
-            // This attribute is set in getHtmlString() using .data() in the attributes builder.
-            final String submitCode = "submitForm(document.getElementById(this.dataset[" + quote + "submitid" + quote + "]).form);";
-
-            if (StringUtils.isBlank(onClick))
-            {
-                onClickMethod += submitCode;
-            }
-            else
-            {
-                // we allow the onclick method to cancel the submit
-                // Question: This isn't activated when the user hits 'enter' so why support this?
-                onClickMethod += "this.form=document.getElementById(this.dataset[" + quote + "submitid" + quote + "]).form;";
-                onClickMethod += "if (isTrueOrUndefined(function(){" + onClick + "}.call(this))) {" + submitCode + "}";
-
-                if (isDisableOnClick())
-                {
-                    onClickMethod += "else {LABKEY.Utils.removeClass(this," + qDisabledCls + ");}";
-                }
-            }
-            onClickMethod += "return false;";
-        }
-        else
-        {
-            onClickMethod += onClick;
-        }
-
-        return onClickMethod;
-    }
-
-    @Override
-    public void render(RenderContext ctx, Writer out) throws IOException
-    {
-        out.write(toString());
-    }
-
-    @Override
-    public String toString()
-    {
-        return getHtmlString().toString();
-    }
-
-    @Override
-    public HtmlString getHtmlString()
-    {
-        var page = HttpView.currentPageConfig();
-        var id = getId();
-        if (StringUtils.isBlank(getId()))
-            id = page.makeId("button_");
-        boolean iconOnly = getIconCls() != null;
-        String submitId = page.makeId("submit_");
-        // In the icon-only button case, use caption as tooltip. This avoids having to set both caption and tooltip
-        final String tip = (null != tooltip ? tooltip : (iconOnly ? caption : null));
-        String clickHandler = generateOnClick();
-
-        var attrs = at(attributes)
-            .id(id)
-            .at(title, tip, Attribute.rel, getRel(), Attribute.name, getName(), Attribute.style, getStyle(), Attribute.target, getTarget())
-            .at(!usePost, Attribute.href, StringUtils.defaultIfBlank(this.href,  "#"), "#")
-            .data(usePost, "href", this.href)
-            .data(usePost, "confirmmessage", confirmMessage)
-            .data("submitid", submitId)         // this id is used by the event handler, stash in a data attribute rather than hard-coding in the handler source
-            .data("tt", null == tip ? null : "tooltip")
-            .data("placement", "top")
-            .cl(CLS, typeCls, getCssClass())
-            .cl(!isEnabled(), DISABLED_CLS)
-            .cl(isDropdown(), "labkey-down-arrow")
-            .cl(isDropdown(), "dropdown-toggle")
-            .cl(iconOnly, "icon-only");
-
-        page.addHandler(id, "click", clickHandler);
-        return createHtmlFragment(
-            isSubmit() ?
-            INPUT(at(type,"submit",tabindex,"-1",Attribute.style,"position:absolute;left:-9999px;width:1px;height:1px;",Attribute.id,submitId)) : null,
-            A(attrs, iconOnly ? FA(getIconCls()) : SPAN(caption))
-        );
-    }
-
-    public static class ButtonBuilder extends DisplayElementBuilder<Button, ButtonBuilder>
-    {
-        private final String caption;
-
-        private String typeCls;
-        private boolean disableOnClick;
-        private boolean dropdown;
-        private boolean submit;
-
-        public ButtonBuilder(@NotNull String caption)
-        {
-            this.caption = caption;
-        }
-
-        @Override
-        protected ButtonBuilder getThis()
-        {
-            return this;
-        }
-
-        public ButtonBuilder dropdown(boolean dropdown)
-        {
-            this.dropdown = dropdown;
-            return this;
-        }
-
-        public ButtonBuilder disableOnClick(boolean disableOnClick)
-        {
-            this.disableOnClick = disableOnClick;
-            return this;
-        }
-
-        public ButtonBuilder primary(boolean primary)
-        {
-            if (primary)
-                this.typeCls = PRIMARY_CLS;
-            // explicitly set typeCls to something other than null so that the default cls isn't applied
-            else
-                this.typeCls = "";
-            return this;
-        }
-
-        public ButtonBuilder submit(boolean submit)
-        {
-            this.submit = submit;
-            this.primary(true);
-            return this;
-        }
-
-        @NotNull
-        @Override
-        public Button build()
-        {
-            return new Button(this);
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/util/ButtonBuilder.java b/api/src/org/labkey/api/util/ButtonBuilder.java
new file mode 100644
index 00000000000..fea5097a287
--- /dev/null
+++ b/api/src/org/labkey/api/util/ButtonBuilder.java
@@ -0,0 +1,299 @@
+package org.labkey.api.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.RenderContext;
+import org.labkey.api.view.DisplayElement;
+import org.labkey.api.view.HttpView;
+import org.labkey.api.writer.HtmlWriter;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.labkey.api.util.DOM.A;
+import static org.labkey.api.util.DOM.Attribute.type;
+import static org.labkey.api.util.DOM.INPUT;
+import static org.labkey.api.util.DOM.LK.FA;
+import static org.labkey.api.util.DOM.SPAN;
+import static org.labkey.api.util.DOM.at;
+import static org.labkey.api.util.DOM.createHtmlFragment;
+
+public class ButtonBuilder extends DisplayElementBuilder<ButtonBuilder.Button, ButtonBuilder>
+{
+    private final String caption;
+
+    private String typeCls;
+    private boolean disableOnClick;
+    private boolean dropdown;
+    private boolean submit;
+
+    public ButtonBuilder(@NotNull String caption)
+    {
+        this.caption = caption;
+    }
+
+    @Override
+    protected ButtonBuilder getThis()
+    {
+        return this;
+    }
+
+    public ButtonBuilder dropdown(boolean dropdown)
+    {
+        this.dropdown = dropdown;
+        return this;
+    }
+
+    public ButtonBuilder disableOnClick(boolean disableOnClick)
+    {
+        this.disableOnClick = disableOnClick;
+        return this;
+    }
+
+    public ButtonBuilder primary(boolean primary)
+    {
+        if (primary)
+            this.typeCls = Button.PRIMARY_CLS;
+            // explicitly set typeCls to something other than null so that the default cls isn't applied
+        else
+            this.typeCls = "";
+        return this;
+    }
+
+    public ButtonBuilder submit(boolean submit)
+    {
+        this.submit = submit;
+        this.primary(true);
+        return this;
+    }
+
+    @NotNull
+    @Override
+    public Button build()
+    {
+        return new Button(this);
+    }
+
+    /**
+     * Basic button UI element. Might be a simple link, have a JavaScript handler, etc.
+     * Testing of this class can be found in the Core module's TestController.ButtonAction
+     */
+    public static class Button extends DisplayElement implements HasHtmlString, SafeToRender
+    {
+        // Button constants
+        private static final String CLS = "labkey-button";
+        private static final String DISABLED_CLS = "labkey-disabled-button";
+        private static final String PRIMARY_CLS = "primary";
+
+        // Composable members
+        private final String cssClass;
+        private final String iconCls;
+        private final String caption; // required
+        private final String href;
+        private final String onClick;
+        private final String id;
+        private final Map<String, String> attributes;
+        private final String tooltip;
+        private final String typeCls;
+        private final boolean disableOnClick;
+        private final boolean dropdown;
+        private final boolean enabled;
+        private final boolean submit;
+        private final boolean usePost;
+        private final String rel;
+        private final String name;
+        private final String style;
+        private final String confirmMessage;
+        private final String target;
+
+        private Button(ButtonBuilder builder)
+        {
+            this.cssClass = builder.cssClass;
+            this.dropdown = builder.dropdown;
+            this.caption = builder.caption;
+            this.href = builder.href;
+            this.onClick = builder.onClick;
+            this.iconCls = builder.iconCls;
+            this.id = builder.id;
+            this.attributes = builder.attributes == null ? Collections.emptyMap() : builder.attributes;
+            this.disableOnClick = builder.disableOnClick;
+            this.enabled = builder.enabled;
+            this.submit = builder.submit;
+            this.tooltip = builder.tooltip;
+            this.typeCls = builder.typeCls;
+            this.usePost = builder.usePost;
+            this.rel = builder.rel;
+            this.name = builder.name;
+            this.style = builder.style;
+            this.confirmMessage = builder.confirmMessage;
+            this.target = builder.target;
+
+            if (this.usePost && null != this.onClick)
+                throw new IllegalStateException("Can't specify both usePost and onClick");
+        }
+
+        public String getCssClass()
+        {
+            return this.cssClass;
+        }
+
+        public String getTarget()
+        {
+            return target;
+        }
+
+        public boolean isDropdown()
+        {
+            return dropdown;
+        }
+
+        public String getName()
+        {
+            return name;
+        }
+
+        public String getRel()
+        {
+            return rel;
+        }
+
+        public String getOnClick()
+        {
+                return onClick;
+        }
+
+        public String getIconCls()
+        {
+            return iconCls;
+        }
+
+        public String getStyle()
+        {
+            return style;
+        }
+
+        public String getId()
+        {
+            return id;
+        }
+
+        public Map<String,String> getAttributes()
+        {
+            return attributes;
+        }
+
+        public boolean isDisableOnClick()
+        {
+            return disableOnClick;
+        }
+
+        public boolean isEnabled()
+        {
+            return enabled;
+        }
+
+        public boolean isSubmit()
+        {
+            return submit;
+        }
+
+        private @NotNull String generateOnClick()
+        {
+            // prepare onclick method and overrides
+            final String onClick = usePost ? PageFlowUtil.postOnClickJavaScriptEvent() : StringUtils.defaultString(getOnClick());
+
+            // we're modifying the javascript, so need to use whatever quoting the caller used
+            char quote = PageFlowUtil.getUsedQuoteSymbol(onClick);
+
+            // quoted CSS classes used in scripting
+            final String qDisabledCls = quote + DISABLED_CLS + quote;
+
+            // check if the disabled class is applied, if so, do nothing onclick
+            String onClickMethod = "if(this.className.indexOf(" + qDisabledCls + ")!=-1)return false;";
+
+            if (isDisableOnClick())
+            {
+                onClickMethod += "LABKEY.Utils.addClass(this," + qDisabledCls + ");";
+            }
+
+            if (isSubmit())
+            {
+                // Grab the id of a form element vial the data.submitid attribute on the button.  This is used to navigate to the form.
+                // This attribute is set in getHtmlString() using .data() in the attributes builder.
+                final String submitCode = "submitForm(document.getElementById(this.dataset[" + quote + "submitid" + quote + "]).form);";
+
+                if (StringUtils.isBlank(onClick))
+                {
+                    onClickMethod += submitCode;
+                }
+                else
+                {
+                    // we allow the onclick method to cancel the submit
+                    // Question: This isn't activated when the user hits 'enter' so why support this?
+                    onClickMethod += "this.form=document.getElementById(this.dataset[" + quote + "submitid" + quote + "]).form;";
+                    onClickMethod += "if (isTrueOrUndefined(function(){" + onClick + "}.call(this))) {" + submitCode + "}";
+
+                    if (isDisableOnClick())
+                    {
+                        onClickMethod += "else {LABKEY.Utils.removeClass(this," + qDisabledCls + ");}";
+                    }
+                }
+                onClickMethod += "return false;";
+            }
+            else
+            {
+                onClickMethod += onClick;
+            }
+
+            return onClickMethod;
+        }
+
+        @Override
+        public void render(RenderContext ctx, HtmlWriter out)
+        {
+            out.write(this);
+        }
+
+        @Override
+        public String toString()
+        {
+            return getHtmlString().toString();
+        }
+
+        @Override
+        public HtmlString getHtmlString()
+        {
+            var page = HttpView.currentPageConfig();
+            var id = getId();
+            if (StringUtils.isBlank(getId()))
+                id = page.makeId("button_");
+            boolean iconOnly = getIconCls() != null;
+            String submitId = page.makeId("submit_");
+            // In the icon-only button case, use caption as tooltip. This avoids having to set both caption and tooltip
+            final String tip = (null != tooltip ? tooltip : (iconOnly ? caption : null));
+            String clickHandler = generateOnClick();
+
+            var attrs = at(attributes)
+                .id(id)
+                .at(DOM.Attribute.title, tip, DOM.Attribute.rel, getRel(), DOM.Attribute.name, getName(), DOM.Attribute.style, getStyle(), DOM.Attribute.target, getTarget())
+                .at(!usePost, DOM.Attribute.href, StringUtils.defaultIfBlank(this.href,  "#"), "#")
+                .data(usePost, "href", this.href)
+                .data(usePost, "confirmmessage", confirmMessage)
+                .data("submitid", submitId)         // this id is used by the event handler, stash in a data attribute rather than hard-coding in the handler source
+                .data("tt", null == tip ? null : "tooltip")
+                .data("placement", "top")
+                .cl(CLS, typeCls, getCssClass())
+                .cl(!isEnabled(), DISABLED_CLS)
+                .cl(isDropdown(), "labkey-down-arrow")
+                .cl(isDropdown(), "dropdown-toggle")
+                .cl(iconOnly, "icon-only");
+
+            page.addHandler(id, "click", clickHandler);
+            return createHtmlFragment(
+                isSubmit() ?
+                INPUT(at(type,"submit", DOM.Attribute.tabindex,"-1", DOM.Attribute.style,"position:absolute;left:-9999px;width:1px;height:1px;", DOM.Attribute.id,submitId)) : null,
+                A(attrs, iconOnly ? FA(getIconCls()) : SPAN(caption))
+            );
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/element/CsrfInput.java b/api/src/org/labkey/api/util/CsrfInput.java
similarity index 61%
rename from api/src/org/labkey/api/util/element/CsrfInput.java
rename to api/src/org/labkey/api/util/CsrfInput.java
index c27d20a4930..21ce9131e58 100644
--- a/api/src/org/labkey/api/util/element/CsrfInput.java
+++ b/api/src/org/labkey/api/util/CsrfInput.java
@@ -1,11 +1,6 @@
-package org.labkey.api.util.element;
+package org.labkey.api.util;
 
 import jakarta.servlet.jsp.JspContext;
-import org.labkey.api.util.CSRFUtil;
-import org.labkey.api.util.HasHtmlString;
-import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.SafeToRender;
-import org.labkey.api.util.element.Input.InputBuilder;
 import org.labkey.api.view.ViewContext;
 
 public class CsrfInput implements HasHtmlString, SafeToRender
@@ -25,7 +20,7 @@ public CsrfInput(JspContext context)
     @Override
     public HtmlString getHtmlString()
     {
-        return new InputBuilder<>().type("hidden").name(CSRFUtil.csrfName).value(_expectedToken).getHtmlString();
+        return InputBuilder.hidden().name(CSRFUtil.csrfName).value(_expectedToken).getHtmlString();
     }
 
     @Override
diff --git a/api/src/org/labkey/api/util/DOM.java b/api/src/org/labkey/api/util/DOM.java
index 824adc24812..6180bbf155c 100644
--- a/api/src/org/labkey/api/util/DOM.java
+++ b/api/src/org/labkey/api/util/DOM.java
@@ -11,7 +11,6 @@
 import org.labkey.api.action.LabKeyError;
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.jsp.taglib.ErrorsTag;
-import org.labkey.api.util.element.CsrfInput;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.ViewContext;
 import org.springframework.context.NoSuchMessageException;
diff --git a/api/src/org/labkey/api/util/DisplayFieldBuilder.java b/api/src/org/labkey/api/util/DisplayFieldBuilder.java
new file mode 100644
index 00000000000..a348586ecd0
--- /dev/null
+++ b/api/src/org/labkey/api/util/DisplayFieldBuilder.java
@@ -0,0 +1,58 @@
+package org.labkey.api.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+
+public class DisplayFieldBuilder extends InputBuilder<DisplayFieldBuilder>
+{
+    @Override
+    public DisplayField build()
+    {
+        return new DisplayField(this);
+    }
+
+    public static class DisplayField extends Input
+    {
+        private DisplayField(DisplayFieldBuilder builder)
+        {
+            super(builder);
+        }
+
+        @Override
+        protected void doInput(Appendable sb) throws IOException
+        {
+            sb.append("<p class=\"form-control-static\">");
+            if (!HtmlString.isEmpty(getValue()))
+                sb.append(h(getValue()));
+            sb.append("</p>");
+        }
+
+        @Override
+        protected void doLabel(Appendable sb) throws IOException
+        {
+            boolean needsLayoutWrapping = Layout.HORIZONTAL.equals(getLayout()) && needsWrapping();
+
+            sb.append("<span");
+
+            String cls = "";
+            if (StringUtils.isNotEmpty(getLabelClassName()))
+                cls += " " + getLabelClassName();
+            if (needsLayoutWrapping)
+                cls += " col-sm-3 col-lg-2";
+
+            if (StringUtils.isNotEmpty(cls))
+                sb.append(" class=\"").append(h(cls)).append("\"");
+
+            sb.append(">");
+
+            if (getLabel() != null)
+                sb.append(h(getLabel())).append(":");
+
+            if (Layout.INLINE.equals(getLayout()) && !HtmlString.isEmpty(getContextContent()))
+                super.doContextField(sb);
+
+            sb.append("</span> ");
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/DomTestCase.java b/api/src/org/labkey/api/util/DomTestCase.java
index 7210b9969ca..b62bd36babd 100644
--- a/api/src/org/labkey/api/util/DomTestCase.java
+++ b/api/src/org/labkey/api/util/DomTestCase.java
@@ -61,13 +61,13 @@ public void test()
         assertTrue(h.toString().endsWith("<option selected>A&amp;W</option></select>"));
 
         h = createHtml(
-                DIV(new Button.ButtonBuilder("button").build())
+                DIV(new ButtonBuilder("button").build())
         );
         assertTrue(h.toString().contains("labkey-button"));
 
 
         h = createHtml(
-                LK.FORM(at(method,"POST"), new Button.ButtonBuilder("button").build())
+                LK.FORM(at(method,"POST"), new ButtonBuilder("button").build())
         );
         assertTrue(h.toString().contains("labkey-button"));
         assertTrue(h.toString().contains("POST"));
diff --git a/api/src/org/labkey/api/util/HelpTopic.java b/api/src/org/labkey/api/util/HelpTopic.java
index 3935e6e3c3e..43c6497c14f 100644
--- a/api/src/org/labkey/api/util/HelpTopic.java
+++ b/api/src/org/labkey/api/util/HelpTopic.java
@@ -22,7 +22,6 @@
 import org.junit.Test;
 import org.labkey.api.Constants;
 import org.labkey.api.module.ModuleLoader;
-import org.labkey.api.util.Link.LinkBuilder;
 import org.labkey.api.view.NavTree;
 
 import java.util.Formatter;
diff --git a/api/src/org/labkey/api/util/InputBuilder.java b/api/src/org/labkey/api/util/InputBuilder.java
new file mode 100644
index 00000000000..648aa008d32
--- /dev/null
+++ b/api/src/org/labkey/api/util/InputBuilder.java
@@ -0,0 +1,1119 @@
+package org.labkey.api.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.labkey.api.data.RenderContext;
+import org.labkey.api.view.DisplayElement;
+import org.labkey.api.view.HttpView;
+import org.labkey.api.writer.HtmlWriter;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+@SuppressWarnings("unchecked")
+public class InputBuilder<T extends InputBuilder<T>> implements HasHtmlString, SafeToRender// TODO: extends DisplayElementBuilder?
+{
+    private String _autoComplete;
+    private Boolean _autoFocus;
+    private boolean _checked;
+    private String _className = "form-control";
+    private HtmlString _contextContent;
+    private String _dataList;
+    private Boolean _disabled;
+    private String _dirName;
+    private Boolean _forceSmallContext;
+    private String _form;
+    private String _formAction;
+    private String _formEncodingType;
+    private String _formMethod;
+    private Boolean _formNoValidate;
+    private String _formTarget;
+    private Boolean _formGroup;
+    private String _id;
+    private String _label;
+    private String _labelClassName = "control-label";
+    private String _title;
+    private Input.Layout _layout;
+    private String _max;
+    private Integer _maxLength;
+    private String _min;
+    private Boolean _multiple;
+    private String _name;
+    private String _onClick;
+    private String _onChange;
+    private String _onFocus;
+    private String _onKeyUp;
+    private String _placeholder;
+    private Boolean _readOnly;
+    private Boolean _required;
+    private String _regExp;
+    private Boolean _showLabel;
+    private Integer _size;
+    private Input.State _state;
+    private Integer _step;
+    private String _stateMessage;
+    private String _type = "text";
+    private HtmlString _value;
+    private Boolean _needsWrapping;
+    private Integer _tabIndex;
+
+    private final List<String> _styles = new LinkedList<>();
+    private final List<DataAttribute> _dataAttributes = new LinkedList<>();
+
+    private record DataAttribute(String name, String value)
+    {
+    }
+
+    public static InputBuilder<?> checkbox()
+    {
+        return new InputBuilder<>().type("checkbox");
+    }
+
+    public static InputBuilder<?> file()
+    {
+        return new InputBuilder<>().type("file");
+    }
+
+    public static InputBuilder<?> hidden()
+    {
+        return new InputBuilder<>().type("hidden");
+    }
+
+    public static InputBuilder<?> radio()
+    {
+        return new InputBuilder<>().type("radio");
+    }
+
+    public static InputBuilder<?> text()
+    {
+        return new InputBuilder<>(); // "text" is the default type
+    }
+
+    public InputBuilder()
+    {
+    }
+
+    public T contextContent(String contextContent)
+    {
+        _contextContent = HtmlString.of(contextContent);
+        return (T) this;
+    }
+
+    public T contextContent(HtmlString contextContent)
+    {
+        _contextContent = contextContent;
+        return (T) this;
+    }
+
+    public T className(String className)
+    {
+        _className = className;
+        return (T) this;
+    }
+
+    public T checked(boolean checked)
+    {
+        _checked = checked;
+        return (T) this;
+    }
+
+    public T disabled(boolean disabled)
+    {
+        _disabled = disabled;
+        return (T) this;
+    }
+
+    public T forceSmallContext(boolean forceSmallContext)
+    {
+        _forceSmallContext = forceSmallContext;
+        return (T) this;
+    }
+
+    public T formGroup(Boolean formGroup)
+    {
+        _formGroup = formGroup;
+        return (T) this;
+    }
+
+    public T id(String id)
+    {
+        _id = id;
+        return (T) this;
+    }
+
+    public T label(String label)
+    {
+        _label = label;
+        return (T) this;
+    }
+
+    public T title(String title)
+    {
+        _title = title;
+        return (T) this;
+    }
+
+    public T labelClassName(String labelClassName)
+    {
+        if (labelClassName != null) // prevent clearing default
+            _labelClassName = labelClassName;
+        return (T) this;
+    }
+
+    public T layout(Input.Layout layout)
+    {
+        _layout = layout;
+        return (T) this;
+    }
+
+    public T stateMessage(String message)
+    {
+        _stateMessage = message;
+        return (T) this;
+    }
+
+    public T name(String name)
+    {
+        _name = name;
+        return (T) this;
+    }
+
+    public T onClick(String onClick)
+    {
+        _onClick = onClick;
+        return (T) this;
+    }
+
+    public T onChange(String onChange)
+    {
+        _onChange = onChange;
+        return (T) this;
+    }
+
+    public T onFocus(String onFocus)
+    {
+        _onFocus = onFocus;
+        return (T) this;
+    }
+
+    public T onKeyUp(String onKeyUp)
+    {
+        _onKeyUp = onKeyUp;
+        return (T) this;
+    }
+
+    public T placeholder(String placeholder)
+    {
+        _placeholder = placeholder;
+        return (T) this;
+    }
+
+    public T required(Boolean required)
+    {
+        _required = required;
+        return (T) this;
+    }
+
+    public T readOnly(Boolean readOnly)
+    {
+        _readOnly = readOnly;
+        return (T) this;
+    }
+
+    public T size(Integer size)
+    {
+        _size = size;
+        return (T) this;
+    }
+
+    public T maxLength(Integer maxLength)
+    {
+        _maxLength = maxLength;
+        return (T) this;
+    }
+
+    public T state(Input.State state)
+    {
+        _state = state;
+        return (T) this;
+    }
+
+    public T showLabel(Boolean showLabel)
+    {
+        _showLabel = showLabel;
+        return (T) this;
+    }
+
+    public T type(String type)
+    {
+        if (type != null) // prevent clearing default
+            _type = type;
+        return (T) this;
+    }
+
+    public T value(@Nullable HtmlString value)
+    {
+        _value = value;
+        return (T) this;
+    }
+
+    public T value(@Nullable HasHtmlString hhs)
+    {
+        _value = null != hhs ? hhs.getHtmlString() : null;
+        return (T) this;
+    }
+
+    public T value(String value)
+    {
+        _value = null != value ? HtmlString.of(value) : null;
+        return (T) this;
+    }
+
+    public T value(int value)
+    {
+        _value = HtmlString.unsafe(String.valueOf(value));
+        return (T) this;
+    }
+
+    public T needsWrapping(Boolean wrapped)
+    {
+        _needsWrapping = wrapped;
+        return (T) this;
+    }
+
+    public T autoComplete(String autoComplete)
+    {
+        _autoComplete = autoComplete;
+        return (T) this;
+    }
+
+    public T dirName(String dirName)
+    {
+        _dirName = dirName;
+        return (T) this;
+    }
+
+    public T form(String form)
+    {
+        _form = form;
+        return (T) this;
+    }
+
+    public T formAction(String formAction)
+    {
+        _formAction = formAction;
+        return (T) this;
+    }
+
+    public T formEncodingType(String formEncodingType)
+    {
+        _formEncodingType = formEncodingType;
+        return (T) this;
+    }
+
+    public T formMethod(String formMethod)
+    {
+        _formMethod = formMethod;
+        return (T) this;
+    }
+
+    public T formNoValidate(Boolean formNoValidate)
+    {
+        _formNoValidate = formNoValidate;
+        return (T) this;
+    }
+
+    public T formTarget(String formTarget)
+    {
+        _formTarget = formTarget;
+        return (T) this;
+    }
+
+    public T autoFocus(Boolean autoFocus)
+    {
+        _autoFocus = autoFocus;
+        return (T) this;
+    }
+
+    public T multiple(Boolean multiple)
+    {
+        _multiple = multiple;
+        return (T) this;
+    }
+
+    public T dataList(String dataList)
+    {
+        _dataList = dataList;
+        return (T) this;
+    }
+
+    public T maxValue(String maxValue)
+    {
+        _max = maxValue;
+        return (T) this;
+    }
+
+    public T minValue(String minValue)
+    {
+        _min = minValue;
+        return (T) this;
+    }
+
+    public T regularExpression(String regularExpression)
+    {
+        _regExp = regularExpression;
+        return (T) this;
+    }
+
+    public T stepValue(Integer stepValue)
+    {
+        _step = stepValue;
+        return (T) this;
+    }
+
+    public T tabIndex(Integer tabIndex)
+    {
+        _tabIndex = tabIndex;
+        return (T) this;
+    }
+
+    public T addStyle(String style)
+    {
+        _styles.add(style);
+        return (T) this;
+    }
+
+    public T addStyles(List<String> styles)
+    {
+        _styles.addAll(styles);
+        return (T) this;
+    }
+
+    // Add an arbitrary "data-" attribute. Name should not include "data-"... the builder will add prefix.
+    public T addDataAttribute(@NotNull String name, @NotNull String value)
+    {
+        _dataAttributes.add(new DataAttribute(name, value));
+        return (T) this;
+    }
+
+    public Input build()
+    {
+        return new Input(this);
+    }
+
+    @Override
+    public String toString()
+    {
+        return build().toString();
+    }
+
+    @Override
+    public HtmlString getHtmlString()
+    {
+        return build().getHtmlString();
+    }
+
+    public static class Input extends DisplayElement implements HasHtmlString, SafeToRender
+    {
+        public enum Layout
+        {
+            HORIZONTAL,
+            INLINE;
+
+            public static Layout get(String layoutName)
+            {
+                for (Layout layout : Layout.values())
+                {
+                    if (layout.name().equalsIgnoreCase(layoutName))
+                        return layout;
+                }
+                return null;
+            }
+        }
+
+        public enum State
+        {
+            ERROR("exclamation-circle"),
+            WARNING("exclamation-triangle"),
+            SUCCESS("check-circle");
+
+            private final String iconClass;
+
+            State(String iconClass)
+            {
+                this.iconClass = iconClass;
+            }
+
+            public String getIconClass()
+            {
+                return iconClass;
+            }
+
+            public static State get(String stateName)
+            {
+                for (State state : State.values())
+                {
+                    if (state.name().equalsIgnoreCase(stateName))
+                        return state;
+                }
+                return null;
+            }
+        }
+
+        private final String _autoComplete;
+        private final boolean _autoFocus;
+        private final boolean _checked;
+        private final String _className;
+        private final HtmlString _contextContent;
+        private final boolean _disabled;
+        private final String _dirName;
+        private final boolean _forceSmallContext;
+        private final String _form;
+        private final String _formAction;
+        private final String _formEncType;
+        private final String _formMethod;
+        private final boolean _formNoValidate;
+        private final String _formTarget;
+        private final boolean _formGroup;
+        private final String _id;
+        private final String _label;
+        private final String _labelClassName;
+        private final String _title;
+        private final Layout _layout;
+        private final String _list;
+        private final String _max;
+        private final Integer _maxLength;
+        private final String _min;
+        private final boolean _multiple;
+        private final String _name;
+        private final boolean _needsWrapping;
+        private final String _onClick;
+        private final String _onChange;
+        private final String _onFocus;
+        private final String _onKeyUp;
+        private final String _placeholder;
+        private final boolean _readOnly;
+        private final String _regExp;
+        private final boolean _required;
+        private final Integer _size;
+        private final State _state;
+        private final Integer _step;
+        private final String _stateMessage;
+        private final boolean _showLabel;
+        private final String _type;
+        private final @Nullable HtmlString _value;
+        private final Integer _tabIndex;
+        private final List<String> _styles;
+        private final List<DataAttribute> _dataAttributes;
+
+        protected Input(InputBuilder<?> builder)
+        {
+            _autoComplete = builder._autoComplete;
+            _autoFocus = builder._autoFocus != null && builder._autoFocus;
+            _contextContent = builder._contextContent;
+            _checked = builder._checked;
+            _className = builder._type.equals("checkbox") || builder._type.equals("radio") ? "form-check" : builder._className;
+            _disabled = builder._disabled != null && builder._disabled;
+            _dirName = builder._dirName;
+            _forceSmallContext = builder._forceSmallContext != null && builder._forceSmallContext;
+            _form = builder._form;
+            _formAction = builder._formAction;
+            _formEncType = builder._formEncodingType;
+            _formMethod = builder._formMethod;
+            _formTarget = builder._formTarget;
+            _formNoValidate = builder._formNoValidate != null && builder._formNoValidate;
+            _formGroup = builder._formGroup != null && builder._formGroup;
+            _id = builder._id;
+            _label = builder._label;
+            _labelClassName = builder._labelClassName;
+            _title = builder._title;
+            _layout = builder._layout;
+            _list = builder._dataList;
+            _stateMessage = builder._stateMessage;
+            _max = builder._max;
+            _maxLength = builder._maxLength;
+            _min = builder._min;
+            _multiple = builder._multiple != null && builder._multiple;
+            _name = builder._name;
+            _onClick = builder._onClick;
+            _onChange = builder._onChange;
+            _onFocus = builder._onFocus;
+            _onKeyUp = builder._onKeyUp;
+            _placeholder = builder._placeholder;
+            _readOnly = builder._readOnly != null && builder._readOnly;
+            _regExp = builder._regExp;
+            _required = builder._required != null && builder._required;
+            _type = builder._type;
+            _size = builder._size;
+            _state = builder._state;
+            _step = builder._step;
+            _showLabel = builder._showLabel == null ? builder._label != null : builder._showLabel;
+            _value = builder._value;
+            _needsWrapping = builder._needsWrapping == null || builder._needsWrapping;
+            _tabIndex = builder._tabIndex;
+            _styles = builder._styles;
+            _dataAttributes = builder._dataAttributes;
+        }
+
+        public String getAutoComplete()
+        {
+            return _autoComplete;
+        }
+
+        public HtmlString getContextContent()
+        {
+            return _contextContent;
+        }
+
+        private boolean isCheckbox()
+        {
+            return "checkbox".equalsIgnoreCase(_type);
+        }
+
+        private boolean isRadio()
+        {
+            return "radio".equalsIgnoreCase(_type);
+        }
+
+        public boolean isChecked()
+        {
+            return _checked;
+        }
+
+        public String getClassName()
+        {
+            return _className;
+        }
+
+        public boolean isDisabled()
+        {
+            return _disabled;
+        }
+
+        public boolean isForceSmallContext()
+        {
+            return _forceSmallContext;
+        }
+
+        public boolean isFormGroup()
+        {
+            return _formGroup;
+        }
+
+        public boolean isHidden()
+        {
+            return "hidden".equalsIgnoreCase(_type);
+        }
+
+        public String getId()
+        {
+            return _id;
+        }
+
+        public String getLabel()
+        {
+            return _label;
+        }
+
+        public String getLabelClassName()
+        {
+            return _labelClassName;
+        }
+
+        public String getTitle()
+        {
+            return _title;
+        }
+
+        public Layout getLayout()
+        {
+            return _layout;
+        }
+
+        public String getStateMessage()
+        {
+            return _stateMessage;
+        }
+
+        public String getName()
+        {
+            return _name;
+        }
+
+        public String getOnClick()
+        {
+            return _onClick;
+        }
+
+        public String getOnChange()
+        {
+            return _onChange;
+        }
+
+        public String getOnFocus()
+        {
+            return _onFocus;
+        }
+
+        public String getOnKeyUp()
+        {
+            return _onKeyUp;
+        }
+
+        public String getPlaceholder()
+        {
+            return _placeholder;
+        }
+
+        public boolean isRequired()
+        {
+            return _required;
+        }
+
+        public boolean isReadOnly()
+        {
+            return _readOnly;
+        }
+
+        public Integer getSize()
+        {
+            return _size;
+        }
+
+        public Integer getMaxLength()
+        {
+            return _maxLength;
+        }
+
+        public State getState()
+        {
+            return _state;
+        }
+
+        public boolean isShowLabel()
+        {
+            return _showLabel;
+        }
+
+        public String getType()
+        {
+            return _type;
+        }
+
+        public HtmlString getValue()
+        {
+            return _value;
+        }
+
+        public boolean needsWrapping()
+        {
+            return _needsWrapping;
+        }
+
+        public boolean isAutoFocused()
+        {
+            return _autoFocus;
+        }
+
+        public String getDirName()
+        {
+            return _dirName;
+        }
+
+        public String getForm()
+        {
+            return _form;
+        }
+
+        public String getFormAction()
+        {
+            return _formAction;
+        }
+
+        public String getFormEncType()
+        {
+            return _formEncType;
+        }
+
+        public String getFormMethod()
+        {
+            return _formMethod;
+        }
+
+        public boolean isFormNoValidate()
+        {
+            return _formNoValidate;
+        }
+
+        public String getFormTarget()
+        {
+            return _formTarget;
+        }
+
+        public String getList()
+        {
+            return _list;
+        }
+
+        public String getMax()
+        {
+            return _max;
+        }
+
+        public String getMin()
+        {
+            return _min;
+        }
+
+        public boolean isMultiple()
+        {
+            return _multiple;
+        }
+
+        public String getRegExp()
+        {
+            return _regExp;
+        }
+
+        public Integer getStep()
+        {
+            return _step;
+        }
+
+        public Integer getTabIndex()
+        {
+            return _tabIndex;
+        }
+
+        public List<String> getStyles()
+        {
+            return _styles;
+        }
+
+        private List<DataAttribute> getDataAttributes()
+        {
+            return _dataAttributes;
+        }
+
+        @Override
+        public void render(RenderContext ctx, HtmlWriter out)
+        {
+            out.write(this);
+        }
+
+        // TODO: Render via DOM!
+        @Override
+        public HtmlString getHtmlString()
+        {
+            StringBuilder sb = new StringBuilder();
+            appendTo(sb);
+            return HtmlString.unsafe(sb.toString());
+        }
+
+        @Override
+        public Appendable appendTo(Appendable sb)
+        {
+            try
+            {
+                if (isHidden())
+                {
+                    doInput(sb);
+                }
+                else
+                {
+                    final boolean isHorizontal = Layout.HORIZONTAL.equals(getLayout());
+                    final boolean needsInputGroup = needsInputGroup();
+                    final boolean needsLayoutWrapping = isHorizontal && needsWrapping();
+
+                    // begin form-group
+                    if (isFormGroup())
+                    {
+                        sb.append("<div class=\"form-group");
+                        if (null != getState())
+                            doValidationStates(sb);
+                        sb.append("\">");
+                    }
+
+                    if (isShowLabel())
+                        doLabel(sb);
+
+                    // begin wrapper for layout
+                    if (needsLayoutWrapping)
+                        sb.append("<div class=\"col-sm-9 col-lg-10\">");
+
+                    // begin wrapper for input group
+                    if (needsInputGroup)
+                    {
+                        sb.append("<div class=\"input-group input-group-unstyled");
+                        if (isHorizontal)
+                            sb.append(" input-group-horizontal");
+                        sb.append("\">");
+                    }
+
+                    doInput(sb);
+
+                    doStateIcon(sb);
+
+                    if (isHorizontal && !isForceSmallContext() && !HtmlString.isEmpty(getContextContent()))
+                        doContextField(sb);
+
+                    // end wrapper for input group
+                    if (needsInputGroup)
+                        sb.append("</div>");
+
+                    // end wrapper for layout
+                    if (needsLayoutWrapping)
+                        sb.append("</div>");
+
+                    // end form-group
+                    if (isFormGroup())
+                        sb.append("</div>");
+                }
+            }
+            catch (IOException io)
+            {
+                UnexpectedException.rethrow(io);
+            }
+
+            return sb;
+        }
+
+        @Override
+        public String toString()
+        {
+            return getHtmlString().toString();
+        }
+
+        protected final String h(String s)
+        {
+            return PageFlowUtil.filter(s);
+        }
+        protected final String h(HtmlString h)
+        {
+            return h.toString();
+        }
+        protected final String h(int i)
+        {
+            return String.valueOf(i);
+        }
+
+            protected void doInput(Appendable sb) throws IOException
+        {
+            sb.append("<input");
+            sb.append(" type=\"").append(h(getType())).append("\"");
+            if (StringUtils.isNotEmpty(getClassName()) && !isHidden())
+            {
+                sb.append(" class=\"").append(h(getClassName()));
+                if (null != getState() && Layout.INLINE.equals(getLayout()))
+                    sb.append(" ").append("inline-stateful-input");
+                sb.append("\"");
+            }
+
+            sb.append(" name=\"").append(h(getName())).append("\"");
+
+            var id = generateId("input");
+
+            sb.append(" id=\"").append(h(id)).append("\"");
+            if (StringUtils.isNotEmpty(getTitle()))
+                sb.append(" title=\"").append(h(getTitle())).append("\"");
+            if (StringUtils.isNotEmpty(getPlaceholder()))
+                sb.append(" placeholder=\"").append(h(getPlaceholder())).append("\"");
+            if (getSize() != null)
+                sb.append(" size=\"").append(h(getSize())).append("\"");
+            if (getMaxLength() != null)
+                sb.append(" maxlength=\"").append(h(getMaxLength())).append("\"");
+            if (StringUtils.isNotEmpty(getAutoComplete()))
+                sb.append(" autocomplete=\"").append(h(getAutoComplete())).append("\"");
+            if (!HtmlString.isEmpty(getContextContent()))
+                sb.append(" aria-describedby=\"").append(h(getId())).append("HelpBlock\""); //described by the help block
+            if (StringUtils.isNotEmpty(getDirName()))
+                sb.append(" dirname=\"").append(h(getDirName())).append("\"");
+            if (StringUtils.isNotEmpty(getForm()))
+                sb.append(" form=\"").append(h(getForm())).append("\"");
+            if (StringUtils.isNotEmpty(getFormAction()))
+                sb.append(" formaction=\"").append(h(getFormAction())).append("\"");
+            if (StringUtils.isNotEmpty(getFormEncType()))
+                sb.append(" formenctype=\"").append(h(getFormEncType())).append("\"");
+            if (StringUtils.isNotEmpty(getFormMethod()))
+                sb.append(" formmethod=\"").append(h(getFormMethod())).append("\"");
+            if (StringUtils.isNotEmpty(getFormTarget()))
+                sb.append(" formtarget=\"").append(h(getFormTarget())).append("\"");
+            if (StringUtils.isNotEmpty(getList()))
+                sb.append(" list=\"").append(h(getList())).append("\"");
+            if (StringUtils.isNotEmpty(getMax()))
+                sb.append(" max=\"").append(h(getMax())).append("\"");
+            if (StringUtils.isNotEmpty(getMin()))
+                sb.append(" min=\"").append(h(getMin())).append("\"");
+            if (StringUtils.isNotEmpty(getRegExp()))
+                sb.append(" pattern=\"").append(h(getRegExp())).append("\"");
+            if (getStep() != null)
+                sb.append(" step=\"").append(h(getStep())).append("\"");
+            if ((isCheckbox() || isRadio()) && isChecked())
+                sb.append(" checked");
+            if (getTabIndex() != null)
+                sb.append(" tabIndex=\"").append(h(_tabIndex)).append("\"");
+
+            doStyles(sb);
+            doDataAttributes(sb);
+            if (!HtmlString.isBlank(getValue()))
+                sb.append(" value=\"").append(h(getValue())).append("\"");
+            doInputEvents(id);
+
+            if (isRequired())
+                sb.append(" required");
+
+            if (isDisabled())
+                sb.append(" disabled");
+
+            if (isReadOnly())
+                sb.append(" readonly");
+
+            if (isFormNoValidate())
+                sb.append(" formnovalidate");
+
+            if (isMultiple())
+                sb.append(" multiple");
+
+            if (isAutoFocused())
+                sb.append(" autofocus");
+
+            sb.append(">");
+        }
+
+        protected String generateId(String prefix)
+        {
+            var id = getId();
+            if (null != id)
+                return id;
+            var pageConfig = HttpView.currentPageConfig();
+            return pageConfig.makeId(prefix);
+        }
+
+        protected void doStyles(Appendable sb) throws IOException
+        {
+            if (!getStyles().isEmpty())
+            {
+                sb.append(" style=\"");
+                getStyles().forEach(s -> {try {sb.append(h(s)).append(";");}catch(IOException io){UnexpectedException.rethrow(io);}});
+                sb.append("\"");
+            }
+        }
+
+        protected void doDataAttributes(Appendable sb)
+        {
+            getDataAttributes().forEach(attr -> {
+                try
+                {
+                    sb.append(" data-").append(attr.name()).append("=\"").append(h(attr.value())).append("\"");
+                }
+                catch (IOException io)
+                {
+                    UnexpectedException.rethrow(io);
+                }
+            });
+        }
+
+        protected void doInputEvents(String id)
+        {
+            var pageConfig = HttpView.currentPageConfig();
+            if (StringUtils.isNotEmpty(getOnClick()))
+                pageConfig.addHandler(id, "click", getOnClick());
+            if (StringUtils.isNotEmpty(getOnChange()))
+                pageConfig.addHandler(id, "change", getOnChange());
+            if (StringUtils.isNotEmpty(getOnFocus()))
+                pageConfig.addHandler(id, "focus", getOnFocus());
+            if (StringUtils.isNotEmpty(getOnKeyUp()))
+                pageConfig.addHandler(id, "keyup", getOnKeyUp());
+        }
+
+        protected void doLabel(Appendable sb) throws IOException
+        {
+            sb.append("<label");
+
+            if (StringUtils.isNotEmpty(getId()))
+                sb.append(" for=\"").append(h(getId())).append("\"");
+
+            String cls = "";
+            if (StringUtils.isNotEmpty(getLabelClassName()))
+                cls += " " + getLabelClassName();
+            if (Layout.HORIZONTAL.equals(getLayout()) && needsWrapping())
+                cls += " col-sm-3 col-lg-2";
+
+            if (StringUtils.isNotEmpty(cls))
+                sb.append(" class=\"").append(h(cls)).append("\"");
+
+            sb.append(">");
+
+            if (getLabel() != null)
+                sb.append(h(getLabel()));
+
+            if ((Layout.INLINE.equals(getLayout()) || isForceSmallContext()) && !HtmlString.isEmpty(getContextContent()))
+                doContextField(sb);
+
+            sb.append("</label> ");
+        }
+
+        private void doStateIcon(Appendable sb) throws IOException
+        {
+            if (null != getState())
+            {
+                String iconClass = getState() != null ? "fa fa-" + getState().getIconClass() : "";
+                sb.append("<span class=\"input-group-addon validation-state\">");
+                sb.append("<i class=\" validation-state-icon ");
+                sb.append(h(iconClass)).append("\"");
+                if (null != getStateMessage())
+                {
+                    sb.append(" data-tt=\"tooltip\" data-container=\"body\" data-placement=\"top\" title=\"");
+                    sb.append(h(getStateMessage()));
+                }
+                sb.append("\"></i>");
+                sb.append("</span>");
+            }
+        }
+
+        private boolean needsInputGroup()
+        {
+            return Layout.INLINE.equals(getLayout()) && !HtmlString.isEmpty(getContextContent()) || null != getState();
+        }
+
+        private void doValidationStates(Appendable sb) throws IOException
+        {
+            if (State.ERROR.equals(getState()))
+                sb.append(" has-error");
+            else if (State.WARNING.equals(getState()))
+                sb.append(" has-warning");
+            else if (State.SUCCESS.equals(getState()))
+                sb.append(" has-success");
+        }
+
+        protected void doContextField(Appendable sb)
+        {
+            try
+            {
+                if (Layout.INLINE.equals(getLayout()) || isForceSmallContext())
+                {
+                    //not enough room when inline; context content hidden under '?' icon, tooltip shown on mouseover
+                    sb.append("<i class=\"fa fa-question-circle context-icon\" data-container=\"body\" data-tt=\"tooltip\" data-placement=\"top\" title=\"");
+                    sb.append(h(getContextContent()));
+                    sb.append("\"></i>");
+                }
+                else
+                {
+                    //context content goes underneath input for horizontal/vertical layout
+                    sb.append("<p");
+                    if (StringUtils.isNotEmpty(getId()))
+                        sb.append(" id=\"").append(getId()).append("HelpBlock\""); //used for aria-describedby
+                    sb.append(" class=\" help-block form-text text-muted \" >");
+                    sb.append(h(getContextContent()));
+                    sb.append("</p>");
+                }
+            }
+            catch (IOException io)
+            {
+                UnexpectedException.rethrow(io);
+            }
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/Link.java b/api/src/org/labkey/api/util/Link.java
deleted file mode 100644
index 55bc3e03f80..00000000000
--- a/api/src/org/labkey/api/util/Link.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util;
-
-import org.jetbrains.annotations.NotNull;
-import org.labkey.api.data.RenderContext;
-import org.labkey.api.util.DOM.Renderable;
-import org.labkey.api.view.DisplayElement;
-import org.labkey.api.view.HttpView;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collections;
-
-import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-import static org.apache.commons.lang3.StringUtils.trimToNull;
-import static org.labkey.api.util.DOM.A;
-import static org.labkey.api.util.DOM.Attribute.disabled;
-import static org.labkey.api.util.DOM.Attribute.href;
-import static org.labkey.api.util.DOM.Attribute.name;
-import static org.labkey.api.util.DOM.Attribute.rel;
-import static org.labkey.api.util.DOM.Attribute.style;
-import static org.labkey.api.util.DOM.Attribute.tabindex;
-import static org.labkey.api.util.DOM.Attribute.target;
-import static org.labkey.api.util.DOM.Attribute.title;
-import static org.labkey.api.util.DOM.at;
-
-public class Link extends DisplayElement implements HasHtmlString
-{
-    private final LinkBuilder lb;
-
-    public Link(LinkBuilder linkBuilder)
-    {
-        lb = linkBuilder;
-
-        if (lb.usePost && null != lb.onClick)
-            throw new IllegalStateException("Can't specify both usePost and onClick");
-    }
-
-    @Override
-    public HtmlString getHtmlString()
-    {
-        return HtmlString.unsafe(appendTo(new StringBuilder()).toString());
-    }
-
-    @Override
-    public Appendable appendTo(Appendable out)
-    {
-        String clickEvent = null;
-
-        if (lb.usePost || isNotEmpty(lb.onClick))
-        {
-             if (lb.usePost)
-                 clickEvent = PageFlowUtil.postOnClickJavaScriptEvent();
-             else
-                 clickEvent = lb.onClick;
-        }
-
-        String id = lb.id;
-
-        // Allow generation of HTML outside an active request, where JavaScript event handlers are unlikely to be important
-        if (HttpView.hasCurrentView())
-        {
-            var page = HttpView.currentPageConfig();
-            if (isBlank(id))
-                id = page.makeId("a_");
-            page.addHandler(id, "click", clickEvent);
-            if (isNotEmpty(lb.onMouseOver))
-                page.addHandler(id, "mouseover", lb.onMouseOver);
-        }
-
-        return A(at(lb.attributes==null ? Collections.emptyMap() : lb.attributes)
-                .cl(lb.iconCls != null, lb.iconCls, lb.cssClass)
-                .id(id)
-                .at(!lb.usePost, href,  defaultIfBlank(lb.href, "#"), "#")
-                .data(lb.usePost, "href", lb.href)
-                .data(lb.usePost, "confirmmessage", trimToNull(lb.confirmMessage))
-                .at(target, lb.target)
-                .at(rel, lb.rel)
-                .at(title, lb.title)
-                .at(style, lb.style)
-                .at(name, lb.name)
-                .at(tabindex, lb.tabindex)
-                .at(lb.enabled, disabled, true)
-                .data(null != lb.tooltip, "tt", "tooltip")
-                .data(null != lb.tooltip, "placement","top")
-                .data(null != lb.tooltip, "original-title", lb.tooltip),
-                (lb.iconCls != null ? null : lb.html)
-        ).appendTo(out);
-    }
-
-    @Override
-    public String toString()
-    {
-        return getHtmlString().toString();
-    }
-
-    @Override
-    public void render(RenderContext ctx, Writer out) throws IOException
-    {
-        appendTo(out);
-    }
-
-    public static class LinkBuilder extends DisplayElementBuilder<Link, LinkBuilder>
-    {
-        public LinkBuilder()
-        {
-            cssClass = "labkey-text-link";
-        }
-
-        public LinkBuilder(@NotNull String text)
-        {
-            this(HtmlString.of(text));
-        }
-
-        public LinkBuilder(@NotNull Renderable html)
-        {
-            this();
-            this.html = html;
-        }
-
-        @Override
-        protected LinkBuilder getThis()
-        {
-            return this;
-        }
-
-        @NotNull
-        @Override
-        public Link build()
-        {
-            return new Link(this);
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/util/LinkBuilder.java b/api/src/org/labkey/api/util/LinkBuilder.java
new file mode 100644
index 00000000000..6cd3e1a06d7
--- /dev/null
+++ b/api/src/org/labkey/api/util/LinkBuilder.java
@@ -0,0 +1,138 @@
+package org.labkey.api.util;
+
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.RenderContext;
+import org.labkey.api.view.DisplayElement;
+import org.labkey.api.view.HttpView;
+import org.labkey.api.writer.HtmlWriter;
+
+import java.util.Collections;
+
+import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.apache.commons.lang3.StringUtils.trimToNull;
+import static org.labkey.api.util.DOM.A;
+import static org.labkey.api.util.DOM.Attribute.disabled;
+import static org.labkey.api.util.DOM.at;
+
+public class LinkBuilder extends DisplayElementBuilder<LinkBuilder.Link, LinkBuilder>
+{
+    // Simple unstyled link -- replacement for hand-coded <a> tags
+    public static LinkBuilder simpleLink(String text, @NotNull URLHelper url)
+    {
+        return new LinkBuilder(text).href(url).clearClasses();
+    }
+
+    // Standard LabKey-styled text link
+    public static LinkBuilder labkeyLink(String text, @NotNull URLHelper url)
+    {
+        return new LinkBuilder(text).href(url);
+    }
+
+    public LinkBuilder()
+    {
+        cssClass = "labkey-text-link";
+    }
+
+    public LinkBuilder(@NotNull String text)
+    {
+        this(HtmlString.of(text));
+    }
+
+    public LinkBuilder(@NotNull DOM.Renderable html)
+    {
+        this();
+        this.html = html;
+    }
+
+    @Override
+    protected LinkBuilder getThis()
+    {
+        return this;
+    }
+
+    @NotNull
+    @Override
+    public Link build()
+    {
+        return new Link(this);
+    }
+
+    public static class Link extends DisplayElement implements HasHtmlString, SafeToRender
+    {
+        private final LinkBuilder lb;
+
+        public Link(LinkBuilder linkBuilder)
+        {
+            lb = linkBuilder;
+
+            if (lb.usePost && null != lb.onClick)
+                throw new IllegalStateException("Can't specify both usePost and onClick");
+        }
+
+        @Override
+        public HtmlString getHtmlString()
+        {
+            return HtmlString.unsafe(appendTo(new StringBuilder()).toString());
+        }
+
+        @Override
+        public Appendable appendTo(Appendable out)
+        {
+            String clickEvent = null;
+
+            if (lb.usePost || isNotEmpty(lb.onClick))
+            {
+                 if (lb.usePost)
+                     clickEvent = PageFlowUtil.postOnClickJavaScriptEvent();
+                 else
+                     clickEvent = lb.onClick;
+            }
+
+            String id = lb.id;
+
+            // Allow generation of HTML outside an active request, where JavaScript event handlers are unlikely to be important
+            if (HttpView.hasCurrentView())
+            {
+                var page = HttpView.currentPageConfig();
+                if (isBlank(id))
+                    id = page.makeId("a_");
+                page.addHandler(id, "click", clickEvent);
+                if (isNotEmpty(lb.onMouseOver))
+                    page.addHandler(id, "mouseover", lb.onMouseOver);
+            }
+
+            return A(at(lb.attributes==null ? Collections.emptyMap() : lb.attributes)
+                    .cl(lb.iconCls != null, lb.iconCls, lb.cssClass)
+                    .id(id)
+                    .at(!lb.usePost, DOM.Attribute.href,  defaultIfBlank(lb.href, "#"), "#")
+                    .data(lb.usePost, "href", lb.href)
+                    .data(lb.usePost, "confirmmessage", trimToNull(lb.confirmMessage))
+                    .at(DOM.Attribute.target, lb.target)
+                    .at(DOM.Attribute.rel, lb.rel)
+                    .at(DOM.Attribute.title, lb.title)
+                    .at(DOM.Attribute.style, lb.style)
+                    .at(DOM.Attribute.name, lb.name)
+                    .at(DOM.Attribute.tabindex, lb.tabindex)
+                    .at(lb.enabled, disabled, true)
+                    .data(null != lb.tooltip, "tt", "tooltip")
+                    .data(null != lb.tooltip, "placement","top")
+                    .data(null != lb.tooltip, "original-title", lb.tooltip),
+                    (lb.iconCls != null ? null : lb.html)
+            ).appendTo(out);
+        }
+
+        @Override
+        public String toString()
+        {
+            return getHtmlString().toString();
+        }
+
+        @Override
+        public void render(RenderContext ctx, HtmlWriter out)
+        {
+            out.write(this);
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/OptionBuilder.java b/api/src/org/labkey/api/util/OptionBuilder.java
new file mode 100644
index 00000000000..8c2f3733ff9
--- /dev/null
+++ b/api/src/org/labkey/api/util/OptionBuilder.java
@@ -0,0 +1,143 @@
+package org.labkey.api.util;
+
+import jakarta.validation.constraints.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class OptionBuilder implements HasHtmlString, SafeToRender
+{
+    private @NotNull HtmlString _label;
+    private @NotNull String _value;
+    private boolean _disabled;
+    private boolean _selected;
+
+    public OptionBuilder()
+    {
+        _label = HtmlString.EMPTY_STRING;
+    }
+
+    public OptionBuilder(String label, @Nullable Object value)
+    {
+        label(label);
+        value(value);
+    }
+
+    public OptionBuilder disabled(boolean disabled)
+    {
+        _disabled = disabled;
+        return this;
+    }
+
+    public OptionBuilder label(String label)
+    {
+        _label = HtmlString.of(label);
+        return this;
+    }
+
+    public OptionBuilder label(@NotNull HtmlString label)
+    {
+        assert null != label;
+        _label = label;
+        return this;
+    }
+
+    public OptionBuilder selected(boolean selected)
+    {
+        _selected = selected;
+        return this;
+    }
+
+    public OptionBuilder value(@Nullable Object value)
+    {
+        _value = null == value ? "" : value.toString();
+        return this;
+    }
+
+    public Option build()
+    {
+        return new Option(this);
+    }
+
+    @Override
+    public String toString()
+    {
+        return getHtmlString().toString();
+    }
+
+    @Override
+    public HtmlString getHtmlString()
+    {
+        return build().getHtmlString();
+    }
+
+    public static class Option implements HasHtmlString, SafeToRender
+    {
+        private final @NotNull HtmlString _label;
+        private final @NotNull String _value;
+        private final boolean _disabled;
+        private final boolean _selected;
+
+        private Option(OptionBuilder builder)
+        {
+            _label = builder._label;
+            _value = builder._value;
+            _disabled = builder._disabled;
+            _selected = builder._selected;
+        }
+
+        public boolean isDisabled()
+        {
+            return _disabled;
+        }
+
+        public HtmlString getLabel()
+        {
+            return _label;
+        }
+
+        public boolean isSelected()
+        {
+            return _selected;
+        }
+
+        public @NotNull String getValue()
+        {
+            return _value;
+        }
+
+        public HtmlString render(boolean forceSelected)
+        {
+            // TODO: This method should do the rendering via DOM or HtmlStringBuilder
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("<option")
+                .append(" value=\"").append(PageFlowUtil.filter(getValue())).append("\"");
+
+            if (isDisabled())
+                sb.append(" disabled");
+
+            if (forceSelected || isSelected())
+                sb.append(" selected");
+
+            sb.append(">");
+
+            if (!HtmlString.EMPTY_STRING.equals(getLabel()))
+                sb.append(getLabel());
+
+            sb.append("</option>");
+
+            return HtmlString.unsafe(sb.toString());
+        }
+
+        @Override
+        public HtmlString getHtmlString()
+        {
+            return render(false);
+        }
+
+        @Override
+        public String toString()
+        {
+            return getHtmlString().toString();
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/PageFlowUtil.java b/api/src/org/labkey/api/util/PageFlowUtil.java
index 2919c730626..dc4020d6a0d 100644
--- a/api/src/org/labkey/api/util/PageFlowUtil.java
+++ b/api/src/org/labkey/api/util/PageFlowUtil.java
@@ -72,9 +72,7 @@
 import org.labkey.api.settings.Theme;
 import org.labkey.api.stats.AnalyticsProvider;
 import org.labkey.api.stats.AnalyticsProviderRegistry;
-import org.labkey.api.util.Button.ButtonBuilder;
 import org.labkey.api.util.DOM.Renderable;
-import org.labkey.api.util.Link.LinkBuilder;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
diff --git a/api/src/org/labkey/api/util/SelectBuilder.java b/api/src/org/labkey/api/util/SelectBuilder.java
new file mode 100644
index 00000000000..33a4e1dd5e4
--- /dev/null
+++ b/api/src/org/labkey/api/util/SelectBuilder.java
@@ -0,0 +1,209 @@
+package org.labkey.api.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+public class SelectBuilder extends InputBuilder<SelectBuilder>
+{
+    private final List<OptionBuilder.Option> _options = new ArrayList<>();
+
+    private boolean _multiple;
+    // Alternative way to specify the selected option - useful when adding options as Strings or Objects
+    private String _selected = null;
+
+    public SelectBuilder()
+    {
+    }
+
+    /**
+     * Adds a single option, either a previously created Option object or a new Option where the key is set to the value.
+     *
+     * @param option An Option, String, or Object
+     * @return The SelectBuilder
+     */
+    public SelectBuilder addOption(Object option)
+    {
+        return addOptions(Stream.of(option));
+    }
+
+    /**
+     * Adds a single Option built from an OptionBuilder, as a convenience.
+     *
+     * @param builder An OptionBuilder
+     * @return The SelectBuilder
+     */
+    public SelectBuilder addOption(OptionBuilder builder)
+    {
+        return addOptions(Stream.of(builder.build()));
+    }
+
+    /**
+     * Adds a single option with the specified label and value.
+     *
+     * @param label The new option's label
+     * @param value The new option's value
+     * @return The SelectBuilder
+     */
+    public SelectBuilder addOption(String label, String value)
+    {
+        return addOption(new OptionBuilder(label, value));
+    }
+
+    /**
+     * Adds multiple options to the &lt;select> elements by supplying a collection of objects. See {@link #addOptions(Stream)}
+     * for more details.
+     *
+     * @param options A collection of Options, OptionBuilders, Strings, or Objects
+     * @return The SelectBuilder
+     */
+    public SelectBuilder addOptions(@NotNull Collection<?> options)
+    {
+        return addOptions(options.stream());
+    }
+
+    /**
+     * Adds multiple options to the &lt;select> element by supplying a {@code Stream<Object>}. If the {@code Stream}
+     * elements are {@code Option} objects then they are simply added. If the elements are {@code OptionBuilder}
+     * objects then new {@code Option} objects are built and added. If the elements are {@code String} or
+     * {@code Object} then new {@code Option} objects are created and added; in this case, the key and value are both
+     * set to the String value of each object.
+     *
+     * @param options A {@code Stream} of Options, OptionBuilders, Strings, or Objects
+     * @return This SelectBuilder
+     */
+    public SelectBuilder addOptions(@NotNull Stream<?> options)
+    {
+        options
+                .filter(Objects::nonNull)
+                .map(o -> {
+                    if (o instanceof OptionBuilder.Option)
+                    {
+                        return (OptionBuilder.Option) o;
+                    }
+                    else if (o instanceof OptionBuilder)
+                    {
+                        return ((OptionBuilder) o).build();
+                    }
+                    else
+                    {
+                        String value = o.toString();
+                        return new OptionBuilder(value, value).build();
+                    }
+
+                })
+                .forEach(_options::add);
+
+        return this;
+    }
+
+    /**
+     * Add multiple options from a map
+     *
+     * @param options A Map&lt;option value, option label>
+     * @return The SelectBuilder
+     */
+    public SelectBuilder addOptions(Map<?, String> options)
+    {
+        return addOptions(
+                options.entrySet().stream()
+                        .map(e -> new OptionBuilder(e.getValue(), e.getKey()).build())
+        );
+    }
+
+    public SelectBuilder multiple(boolean multiple)
+    {
+        _multiple = multiple;
+        return this;
+    }
+
+    public SelectBuilder selected(@Nullable Object key)
+    {
+        _selected = null != key ? key.toString() : null;
+        return this;
+    }
+
+    @Override
+    public Select build()
+    {
+        return new Select(this);
+    }
+
+    public static class Select extends Input
+    {
+        private final boolean _multiple;
+        private final List<OptionBuilder.Option> _options;
+        private final String _selected;
+
+        private Select(SelectBuilder builder)
+        {
+            super(builder);
+            _multiple = builder._multiple;
+            _options = builder._options;
+            _selected = builder._selected;
+        }
+
+        @Override
+        public boolean isMultiple()
+        {
+            return _multiple;
+        }
+
+        public @NotNull List<OptionBuilder.Option> getOptions()
+        {
+            return _options;
+        }
+
+        @Override
+        protected void doInput(Appendable sb) throws IOException
+        {
+            var id = StringUtils.defaultIfBlank(getId(), generateId("select"));
+
+            sb.append("<select").append(" id=\"").append(h(id)).append("\" name=\"").append(h(getName())).append("\"");
+
+            if (StringUtils.isNotEmpty(getClassName()))
+                sb.append(" class=\"").append(h(getClassName())).append("\"");
+            if (StringUtils.isNotEmpty(getPlaceholder()))
+                sb.append(" placeholder=\"").append(h(getPlaceholder())).append("\"");
+            if (getSize() != null)
+                sb.append(" size=\"").append(h(getSize())).append("\"");
+            if (isMultiple())
+                sb.append(" multiple");
+
+            doStyles(sb);
+
+            doDataAttributes(sb);
+
+            doInputEvents(id);
+
+            if (isDisabled())
+                sb.append(" disabled");
+
+            sb.append(">");
+
+            doOptions(sb);
+
+            sb.append("</select>");
+        }
+
+        private void doOptions(Appendable sb) throws IOException
+        {
+            for (OptionBuilder.Option o : getOptions())
+            {
+                if (o != null)
+                {
+                    boolean forceSelected = null != _selected && _selected.equals(o.getValue());
+                    sb.append(h(o.render(forceSelected)));
+                }
+            }
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/TextAreaBuilder.java b/api/src/org/labkey/api/util/TextAreaBuilder.java
new file mode 100644
index 00000000000..f29832556b1
--- /dev/null
+++ b/api/src/org/labkey/api/util/TextAreaBuilder.java
@@ -0,0 +1,83 @@
+package org.labkey.api.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+
+public class TextAreaBuilder extends InputBuilder<TextAreaBuilder>
+{
+    private Integer _columns;
+    private Integer _rows;
+
+    public TextAreaBuilder columns(Integer columns)
+    {
+        _columns = columns;
+        return this;
+    }
+
+    public TextAreaBuilder rows(Integer rows)
+    {
+        _rows = rows;
+        return this;
+    }
+
+    @Override
+    public TextArea build()
+    {
+        return new TextArea(this);
+    }
+
+    public static class TextArea extends Input
+    {
+        private final int _columns;
+        private final int _rows;
+
+        private TextArea(TextAreaBuilder builder)
+        {
+            super(builder);
+            _columns = builder._columns == null ? -1 : builder._columns;
+            _rows = builder._rows == null ? -1 : builder._rows;
+        }
+
+        public int getColumns()
+        {
+            return _columns;
+        }
+
+        public int getRows()
+        {
+            return _rows;
+        }
+
+        @Override
+        protected void doInput(Appendable sb) throws IOException
+        {
+            var id = generateId("textarea");
+            sb.append("<textarea id=\"").append(h(id)).append("\" name=\"").append(h(getName())).append("\"");
+
+            if (getColumns() != -1)
+                sb.append(" cols=\"").append(h(getColumns())).append("\"");
+            if (getRows() != -1)
+                sb.append(" rows=\"").append(h(getRows())).append("\"");
+
+            if (StringUtils.isNotEmpty(getId()))
+                sb.append(" id=\"").append(h(getId())).append("\"");
+            if (StringUtils.isNotEmpty(getClassName()))
+                sb.append(" class=\"").append(h(getClassName())).append("\"");
+            if (StringUtils.isNotEmpty(getPlaceholder()))
+                sb.append(" placeholder=\"").append(h(getPlaceholder())).append("\"");
+
+            doInputEvents(id);
+
+            if (isDisabled())
+                sb.append(" disabled");
+
+            sb.append(">");
+
+            if (!HtmlString.isEmpty(getValue()))
+                sb.append(h(getValue()));
+
+            sb.append("</textarea>");
+        }
+    }
+}
diff --git a/api/src/org/labkey/api/util/element/DisplayField.java b/api/src/org/labkey/api/util/element/DisplayField.java
deleted file mode 100644
index 2c78f1365af..00000000000
--- a/api/src/org/labkey/api/util/element/DisplayField.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2017-2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util.element;
-
-import org.apache.commons.lang3.StringUtils;
-import org.labkey.api.util.HtmlString;
-
-import java.io.IOException;
-
-public class DisplayField extends Input
-{
-    private DisplayField(DisplayFieldBuilder builder)
-    {
-        super(builder);
-    }
-
-    @Override
-    protected void doInput(Appendable sb) throws IOException
-    {
-        sb.append("<p class=\"form-control-static\">");
-        if (!HtmlString.isEmpty(getValue()))
-            sb.append(h(getValue()));
-        sb.append("</p>");
-    }
-
-    @Override
-    protected void doLabel(Appendable sb) throws IOException
-    {
-        boolean needsLayoutWrapping = Layout.HORIZONTAL.equals(getLayout()) && needsWrapping();
-
-        sb.append("<span");
-
-        String cls = "";
-        if (StringUtils.isNotEmpty(getLabelClassName()))
-            cls += " " + getLabelClassName();
-        if (needsLayoutWrapping)
-            cls += " col-sm-3 col-lg-2";
-
-        if (StringUtils.isNotEmpty(cls))
-            sb.append(" class=\"").append(h(cls)).append("\"");
-
-        sb.append(">");
-
-        if (getLabel() != null)
-            sb.append(h(getLabel())).append(":");
-
-        if (Layout.INLINE.equals(getLayout()) && !HtmlString.isEmpty(getContextContent()))
-            super.doContextField(sb);
-
-        sb.append("</span> ");
-    }
-
-    public static class DisplayFieldBuilder extends InputBuilder<DisplayFieldBuilder>
-    {
-        @Override
-        public DisplayField build()
-        {
-            return new DisplayField(this);
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/util/element/Input.java b/api/src/org/labkey/api/util/element/Input.java
deleted file mode 100644
index a5db642b100..00000000000
--- a/api/src/org/labkey/api/util/element/Input.java
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*
- * Copyright (c) 2017-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util.element;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.labkey.api.data.RenderContext;
-import org.labkey.api.util.HasHtmlString;
-import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.SafeToRender;
-import org.labkey.api.util.UnexpectedException;
-import org.labkey.api.view.DisplayElement;
-import org.labkey.api.view.HttpView;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.LinkedList;
-import java.util.List;
-
-public class Input extends DisplayElement implements HasHtmlString, SafeToRender
-{
-    public enum Layout
-    {
-        HORIZONTAL,
-        INLINE;
-
-        public static Layout get(String layoutName)
-        {
-            for (Layout layout : values())
-            {
-                if (layout.name().equalsIgnoreCase(layoutName))
-                    return layout;
-            }
-            return null;
-        }
-    }
-
-    public enum State
-    {
-        ERROR("exclamation-circle"),
-        WARNING("exclamation-triangle"),
-        SUCCESS("check-circle");
-
-        private final String iconClass;
-
-        State(String iconClass)
-        {
-            this.iconClass = iconClass;
-        }
-
-        public String getIconClass()
-        {
-            return iconClass;
-        }
-
-        public static State get(String stateName)
-        {
-            for (State state : values())
-            {
-                if (state.name().equalsIgnoreCase(stateName))
-                    return state;
-            }
-            return null;
-        }
-    }
-
-    private final String _autoComplete;
-    private final boolean _autoFocus;
-    private final boolean _checked;
-    private final String _className;
-    private final HtmlString _contextContent;
-    private final boolean _disabled;
-    private final String _dirName;
-    private final boolean _forceSmallContext;
-    private final String _form;
-    private final String _formAction;
-    private final String _formEncType;
-    private final String _formMethod;
-    private final boolean _formNoValidate;
-    private final String _formTarget;
-    private final boolean _formGroup;
-    private final String _id;
-    private final String _label;
-    private final String _labelClassName;
-    private final String _title;
-    private final Layout _layout;
-    private final String _list;
-    private final String _max;
-    private final Integer _maxLength;
-    private final String _min;
-    private final boolean _multiple;
-    private final String _name;
-    private final boolean _needsWrapping;
-    private final String _onClick;
-    private final String _onChange;
-    private final String _onFocus;
-    private final String _onKeyUp;
-    private final String _placeholder;
-    private final boolean _readOnly;
-    private final String _regExp;
-    private final boolean _required;
-    private final Integer _size;
-    private final State _state;
-    private final Integer _step;
-    private final String _stateMessage;
-    private final boolean _showLabel;
-    private final String _type;
-    private final @Nullable HtmlString _value;
-    private final Integer _tabIndex;
-    private final List<String> _styles;
-    private final List<InputBuilder.DataAttribute> _dataAttributes;
-
-    protected Input(InputBuilder<?> builder)
-    {
-        _autoComplete = builder._autoComplete;
-        _autoFocus = builder._autoFocus != null && builder._autoFocus;
-        _contextContent = builder._contextContent;
-        _checked = builder._checked;
-        _className = builder._type.equals("checkbox") || builder._type.equals("radio") ? "form-check" : builder._className;
-        _disabled = builder._disabled != null && builder._disabled;
-        _dirName = builder._dirName;
-        _forceSmallContext = builder._forceSmallContext != null && builder._forceSmallContext;
-        _form = builder._form;
-        _formAction = builder._formAction;
-        _formEncType = builder._formEncodingType;
-        _formMethod = builder._formMethod;
-        _formTarget = builder._formTarget;
-        _formNoValidate = builder._formNoValidate != null && builder._formNoValidate;
-        _formGroup = builder._formGroup != null && builder._formGroup;
-        _id = builder._id;
-        _label = builder._label;
-        _labelClassName = builder._labelClassName;
-        _title = builder._title;
-        _layout = builder._layout;
-        _list = builder._dataList;
-        _stateMessage = builder._stateMessage;
-        _max = builder._max;
-        _maxLength = builder._maxLength;
-        _min = builder._min;
-        _multiple = builder._multiple != null && builder._multiple;
-        _name = builder._name;
-        _onClick = builder._onClick;
-        _onChange = builder._onChange;
-        _onFocus = builder._onFocus;
-        _onKeyUp = builder._onKeyUp;
-        _placeholder = builder._placeholder;
-        _readOnly = builder._readOnly != null && builder._readOnly;
-        _regExp = builder._regExp;
-        _required = builder._required != null && builder._required;
-        _type = builder._type;
-        _size = builder._size;
-        _state = builder._state;
-        _step = builder._step;
-        _showLabel = builder._showLabel == null ? builder._label != null : builder._showLabel;
-        _value = builder._value;
-        _needsWrapping = builder._needsWrapping == null || builder._needsWrapping;
-        _tabIndex = builder._tabIndex;
-        _styles = builder._styles;
-        _dataAttributes = builder._dataAttributes;
-    }
-
-    public String getAutoComplete()
-    {
-        return _autoComplete;
-    }
-
-    public HtmlString getContextContent()
-    {
-        return _contextContent;
-    }
-
-    private boolean isCheckbox()
-    {
-        return "checkbox".equalsIgnoreCase(_type);
-    }
-
-    private boolean isRadio()
-    {
-        return "radio".equalsIgnoreCase(_type);
-    }
-
-    public boolean isChecked()
-    {
-        return _checked;
-    }
-
-    public String getClassName()
-    {
-        return _className;
-    }
-
-    public boolean isDisabled()
-    {
-        return _disabled;
-    }
-
-    public boolean isForceSmallContext()
-    {
-        return _forceSmallContext;
-    }
-
-    public boolean isFormGroup()
-    {
-        return _formGroup;
-    }
-
-    public boolean isHidden()
-    {
-        return "hidden".equalsIgnoreCase(_type);
-    }
-
-    public String getId()
-    {
-        return _id;
-    }
-
-    public String getLabel()
-    {
-        return _label;
-    }
-
-    public String getLabelClassName()
-    {
-        return _labelClassName;
-    }
-
-    public String getTitle()
-    {
-        return _title;
-    }
-
-    public Layout getLayout()
-    {
-        return _layout;
-    }
-
-    public String getStateMessage()
-    {
-        return _stateMessage;
-    }
-
-    public String getName()
-    {
-        return _name;
-    }
-
-    public String getOnClick()
-    {
-        return _onClick;
-    }
-
-    public String getOnChange()
-    {
-        return _onChange;
-    }
-
-    public String getOnFocus()
-    {
-        return _onFocus;
-    }
-
-    public String getOnKeyUp()
-    {
-        return _onKeyUp;
-    }
-
-    public String getPlaceholder()
-    {
-        return _placeholder;
-    }
-
-    public boolean isRequired()
-    {
-        return _required;
-    }
-
-    public boolean isReadOnly()
-    {
-        return _readOnly;
-    }
-
-    public Integer getSize()
-    {
-        return _size;
-    }
-
-    public Integer getMaxLength()
-    {
-        return _maxLength;
-    }
-
-    public State getState()
-    {
-        return _state;
-    }
-
-    public boolean isShowLabel()
-    {
-        return _showLabel;
-    }
-
-    public String getType()
-    {
-        return _type;
-    }
-
-    public HtmlString getValue()
-    {
-        return _value;
-    }
-
-    public boolean needsWrapping()
-    {
-        return _needsWrapping;
-    }
-
-    public boolean isAutoFocused()
-    {
-        return _autoFocus;
-    }
-
-    public String getDirName()
-    {
-        return _dirName;
-    }
-
-    public String getForm()
-    {
-        return _form;
-    }
-
-    public String getFormAction()
-    {
-        return _formAction;
-    }
-
-    public String getFormEncType()
-    {
-        return _formEncType;
-    }
-
-    public String getFormMethod()
-    {
-        return _formMethod;
-    }
-
-    public boolean isFormNoValidate()
-    {
-        return _formNoValidate;
-    }
-
-    public String getFormTarget()
-    {
-        return _formTarget;
-    }
-
-    public String getList()
-    {
-        return _list;
-    }
-
-    public String getMax()
-    {
-        return _max;
-    }
-
-    public String getMin()
-    {
-        return _min;
-    }
-
-    public boolean isMultiple()
-    {
-        return _multiple;
-    }
-
-    public String getRegExp()
-    {
-        return _regExp;
-    }
-
-    public Integer getStep()
-    {
-        return _step;
-    }
-
-    public Integer getTabIndex()
-    {
-        return _tabIndex;
-    }
-
-    public List<String> getStyles()
-    {
-        return _styles;
-    }
-
-    private List<InputBuilder.DataAttribute> getDataAttributes()
-    {
-        return _dataAttributes;
-    }
-
-    @Override
-    public void render(RenderContext ctx, Writer out) throws IOException
-    {
-        out.write(toString());
-    }
-
-    // TODO: Render via DOM or HtmlStringBuilder
-    @Override
-    public HtmlString getHtmlString()
-    {
-        StringBuilder sb = new StringBuilder();
-        appendTo(sb);
-        return HtmlString.unsafe(sb.toString());
-    }
-
-    @Override
-    public Appendable appendTo(Appendable sb)
-    {
-        try
-        {
-            if (isHidden())
-            {
-                doInput(sb);
-            }
-            else
-            {
-                final boolean isHorizontal = Layout.HORIZONTAL.equals(getLayout());
-                final boolean needsInputGroup = needsInputGroup();
-                final boolean needsLayoutWrapping = isHorizontal && needsWrapping();
-
-                // begin form-group
-                if (isFormGroup())
-                {
-                    sb.append("<div class=\"form-group");
-                    if (null != getState())
-                        doValidationStates(sb);
-                    sb.append("\">");
-                }
-
-                if (isShowLabel())
-                    doLabel(sb);
-
-                // begin wrapper for layout
-                if (needsLayoutWrapping)
-                    sb.append("<div class=\"col-sm-9 col-lg-10\">");
-
-                // begin wrapper for input group
-                if (needsInputGroup)
-                {
-                    sb.append("<div class=\"input-group input-group-unstyled");
-                    if (isHorizontal)
-                        sb.append(" input-group-horizontal");
-                    sb.append("\">");
-                }
-
-                doInput(sb);
-
-                doStateIcon(sb);
-
-                if (isHorizontal && !isForceSmallContext() && !HtmlString.isEmpty(getContextContent()))
-                    doContextField(sb);
-
-                // end wrapper for input group
-                if (needsInputGroup)
-                    sb.append("</div>");
-
-                // end wrapper for layout
-                if (needsLayoutWrapping)
-                    sb.append("</div>");
-
-                // end form-group
-                if (isFormGroup())
-                    sb.append("</div>");
-            }
-        }
-        catch (IOException io)
-        {
-            UnexpectedException.rethrow(io);
-        }
-
-        return sb;
-    }
-
-    @Override
-    public String toString()
-    {
-        return getHtmlString().toString();
-    }
-
-    protected final String h(String s)
-    {
-        return PageFlowUtil.filter(s);
-    }
-    protected final String h(HtmlString h)
-    {
-        return h.toString();
-    }
-    protected final String h(int i)
-    {
-        return String.valueOf(i);
-    }
-
-
-    protected void doInput(Appendable sb) throws IOException
-    {
-        sb.append("<input");
-        sb.append(" type=\"").append(h(getType())).append("\"");
-        if (StringUtils.isNotEmpty(getClassName()) && !isHidden())
-        {
-            sb.append(" class=\"").append(h(getClassName()));
-            if (null != getState() && Layout.INLINE.equals(getLayout()))
-                sb.append(" ").append("inline-stateful-input");
-            sb.append("\"");
-        }
-
-        sb.append(" name=\"").append(h(getName())).append("\"");
-
-        var id = generateId("input");
-
-        sb.append(" id=\"").append(h(id)).append("\"");
-        if (StringUtils.isNotEmpty(getTitle()))
-            sb.append(" title=\"").append(h(getTitle())).append("\"");
-        if (StringUtils.isNotEmpty(getPlaceholder()))
-            sb.append(" placeholder=\"").append(h(getPlaceholder())).append("\"");
-        if (getSize() != null)
-            sb.append(" size=\"").append(h(getSize())).append("\"");
-        if (getMaxLength() != null)
-            sb.append(" maxlength=\"").append(h(getMaxLength())).append("\"");
-        if (StringUtils.isNotEmpty(getAutoComplete()))
-            sb.append(" autocomplete=\"").append(h(getAutoComplete())).append("\"");
-        if (!HtmlString.isEmpty(getContextContent()))
-            sb.append(" aria-describedby=\"").append(h(getId())).append("HelpBlock\""); //described by the help block
-        if (StringUtils.isNotEmpty(getDirName()))
-            sb.append(" dirname=\"").append(h(getDirName())).append("\"");
-        if (StringUtils.isNotEmpty(getForm()))
-            sb.append(" form=\"").append(h(getForm())).append("\"");
-        if (StringUtils.isNotEmpty(getFormAction()))
-            sb.append(" formaction=\"").append(h(getFormAction())).append("\"");
-        if (StringUtils.isNotEmpty(getFormEncType()))
-            sb.append(" formenctype=\"").append(h(getFormEncType())).append("\"");
-        if (StringUtils.isNotEmpty(getFormMethod()))
-            sb.append(" formmethod=\"").append(h(getFormMethod())).append("\"");
-        if (StringUtils.isNotEmpty(getFormTarget()))
-            sb.append(" formtarget=\"").append(h(getFormTarget())).append("\"");
-        if (StringUtils.isNotEmpty(getList()))
-            sb.append(" list=\"").append(h(getList())).append("\"");
-        if (StringUtils.isNotEmpty(getMax()))
-            sb.append(" max=\"").append(h(getMax())).append("\"");
-        if (StringUtils.isNotEmpty(getMin()))
-            sb.append(" min=\"").append(h(getMin())).append("\"");
-        if (StringUtils.isNotEmpty(getRegExp()))
-            sb.append(" pattern=\"").append(h(getRegExp())).append("\"");
-        if (getStep() != null)
-            sb.append(" step=\"").append(h(getStep())).append("\"");
-        if ((isCheckbox() || isRadio()) && isChecked())
-            sb.append(" checked");
-        if (getTabIndex() != null)
-            sb.append(" tabIndex=\"").append(h(_tabIndex)).append("\"");
-
-        doStyles(sb);
-        doDataAttributes(sb);
-        if (!HtmlString.isBlank(getValue()))
-            sb.append(" value=\"").append(h(getValue())).append("\"");
-        doInputEvents(id);
-
-        if (isRequired())
-            sb.append(" required");
-
-        if (isDisabled())
-            sb.append(" disabled");
-
-        if (isReadOnly())
-            sb.append(" readonly");
-
-        if (isFormNoValidate())
-            sb.append(" formnovalidate");
-
-        if (isMultiple())
-            sb.append(" multiple");
-
-        if (isAutoFocused())
-            sb.append(" autofocus");
-
-        sb.append(">");
-    }
-
-    protected String generateId(String prefix)
-    {
-        var id = getId();
-        if (null != id)
-            return id;
-        var pageConfig = HttpView.currentPageConfig();
-        return pageConfig.makeId(prefix);
-    }
-
-    protected void doStyles(Appendable sb) throws IOException
-    {
-        if (!getStyles().isEmpty())
-        {
-            sb.append(" style=\"");
-            getStyles().forEach(s -> {try {sb.append(h(s)).append(";");}catch(IOException io){UnexpectedException.rethrow(io);}});
-            sb.append("\"");
-        }
-    }
-
-    protected void doDataAttributes(Appendable sb)
-    {
-        getDataAttributes().forEach(attr -> {
-            try
-            {
-                sb.append(" data-").append(attr.name()).append("=\"").append(h(attr.value())).append("\"");
-            }
-            catch (IOException io)
-            {
-                UnexpectedException.rethrow(io);
-            }
-        });
-    }
-
-    protected void doInputEvents(String id)
-    {
-        var pageConfig = HttpView.currentPageConfig();
-        if (StringUtils.isNotEmpty(getOnClick()))
-            pageConfig.addHandler(id, "click", getOnClick());
-        if (StringUtils.isNotEmpty(getOnChange()))
-            pageConfig.addHandler(id, "change", getOnChange());
-        if (StringUtils.isNotEmpty(getOnFocus()))
-            pageConfig.addHandler(id, "focus", getOnFocus());
-        if (StringUtils.isNotEmpty(getOnKeyUp()))
-            pageConfig.addHandler(id, "keyup", getOnKeyUp());
-    }
-
-    protected void doLabel(Appendable sb) throws IOException
-    {
-        sb.append("<label");
-
-        if (StringUtils.isNotEmpty(getId()))
-            sb.append(" for=\"").append(h(getId())).append("\"");
-
-        String cls = "";
-        if (StringUtils.isNotEmpty(getLabelClassName()))
-            cls += " " + getLabelClassName();
-        if (Layout.HORIZONTAL.equals(getLayout()) && needsWrapping())
-            cls += " col-sm-3 col-lg-2";
-
-        if (StringUtils.isNotEmpty(cls))
-            sb.append(" class=\"").append(h(cls)).append("\"");
-
-        sb.append(">");
-
-        if (getLabel() != null)
-            sb.append(h(getLabel()));
-
-        if ((Layout.INLINE.equals(getLayout()) || isForceSmallContext()) && !HtmlString.isEmpty(getContextContent()))
-            doContextField(sb);
-
-        sb.append("</label> ");
-    }
-
-    private void doStateIcon(Appendable sb) throws IOException
-    {
-        if (null != getState())
-        {
-            String iconClass = getState() != null ? "fa fa-" + getState().getIconClass() : "";
-            sb.append("<span class=\"input-group-addon validation-state\">");
-            sb.append("<i class=\" validation-state-icon ");
-            sb.append(h(iconClass)).append("\"");
-            if (null != getStateMessage())
-            {
-                sb.append(" data-tt=\"tooltip\" data-container=\"body\" data-placement=\"top\" title=\"");
-                sb.append(h(getStateMessage()));
-            }
-            sb.append("\"></i>");
-            sb.append("</span>");
-        }
-    }
-
-    private boolean needsInputGroup()
-    {
-        return Layout.INLINE.equals(getLayout()) && !HtmlString.isEmpty(getContextContent()) || null != getState();
-    }
-
-    private void doValidationStates(Appendable sb) throws IOException
-    {
-        if (State.ERROR.equals(getState()))
-            sb.append(" has-error");
-        else if (State.WARNING.equals(getState()))
-            sb.append(" has-warning");
-        else if (State.SUCCESS.equals(getState()))
-            sb.append(" has-success");
-    }
-
-    protected void doContextField(Appendable sb)
-    {
-        try
-        {
-            if (Layout.INLINE.equals(getLayout()) || isForceSmallContext())
-            {
-                //not enough room when inline; context content hidden under '?' icon, tooltip shown on mouseover
-                sb.append("<i class=\"fa fa-question-circle context-icon\" data-container=\"body\" data-tt=\"tooltip\" data-placement=\"top\" title=\"");
-                sb.append(h(getContextContent()));
-                sb.append("\"></i>");
-            }
-            else
-            {
-                //context content goes underneath input for horizontal/vertical layout
-                sb.append("<p");
-                if (StringUtils.isNotEmpty(getId()))
-                    sb.append(" id=\"").append(getId()).append("HelpBlock\""); //used for aria-describedby
-                sb.append(" class=\" help-block form-text text-muted \" >");
-                sb.append(h(getContextContent()));
-                sb.append("</p>");
-            }
-        }
-        catch (IOException io)
-        {
-            UnexpectedException.rethrow(io);
-        }
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public static class InputBuilder<T extends InputBuilder<T>> implements HasHtmlString, SafeToRender// TODO: extends DisplayElementBuilder?
-    {
-        private String _autoComplete;
-        private Boolean _autoFocus;
-        private boolean _checked;
-        private String _className = "form-control";
-        private HtmlString _contextContent;
-        private String _dataList;
-        private Boolean _disabled;
-        private String _dirName;
-        private Boolean _forceSmallContext;
-        private String _form;
-        private String _formAction;
-        private String _formEncodingType;
-        private String _formMethod;
-        private Boolean _formNoValidate;
-        private String _formTarget;
-        private Boolean _formGroup;
-        private String _id;
-        private String _label;
-        private String _labelClassName = "control-label";
-        private String _title;
-        private Layout _layout;
-        private String _max;
-        private Integer _maxLength;
-        private String _min;
-        private Boolean _multiple;
-        private String _name;
-        private String _onClick;
-        private String _onChange;
-        private String _onFocus;
-        private String _onKeyUp;
-        private String _placeholder;
-        private Boolean _readOnly;
-        private Boolean _required;
-        private String _regExp;
-        private Boolean _showLabel;
-        private Integer _size;
-        private State _state;
-        private Integer _step;
-        private String _stateMessage;
-        private String _type = "text";
-        private HtmlString _value;
-        private Boolean _needsWrapping;
-        private Integer _tabIndex;
-
-        private final List<String> _styles = new LinkedList<>();
-        private final List<DataAttribute> _dataAttributes = new LinkedList<>();
-
-        private record DataAttribute(String name, String value) {}
-
-        public InputBuilder()
-        {
-        }
-
-        public T contextContent(String contextContent)
-        {
-            _contextContent = HtmlString.of(contextContent);
-            return (T)this;
-        }
-
-        public T contextContent(HtmlString contextContent)
-        {
-            _contextContent = contextContent;
-            return (T)this;
-        }
-
-        public T className(String className)
-        {
-            _className = className;
-            return (T)this;
-        }
-
-        public T checked(boolean checked)
-        {
-            _checked = checked;
-            return (T)this;
-        }
-
-        public T disabled(boolean disabled)
-        {
-            _disabled = disabled;
-            return (T)this;
-        }
-
-        public T forceSmallContext(boolean forceSmallContext)
-        {
-            _forceSmallContext = forceSmallContext;
-            return (T)this;
-        }
-
-        public T formGroup(Boolean formGroup)
-        {
-            _formGroup = formGroup;
-            return (T)this;
-        }
-
-        public T id(String id)
-        {
-            _id = id;
-            return (T)this;
-        }
-
-        public T label(String label)
-        {
-            _label = label;
-            return (T)this;
-        }
-
-        public T title(String title)
-        {
-            _title = title;
-            return (T)this;
-        }
-
-        public T labelClassName(String labelClassName)
-        {
-            if (labelClassName != null) // prevent clearing default
-                _labelClassName = labelClassName;
-            return (T)this;
-        }
-
-        public T layout(Layout layout)
-        {
-            _layout = layout;
-            return (T)this;
-        }
-
-        public T stateMessage(String message)
-        {
-            _stateMessage = message;
-            return (T)this;
-        }
-
-        public T name(String name)
-        {
-            _name = name;
-            return (T)this;
-        }
-
-        public T onClick(String onClick)
-        {
-            _onClick = onClick;
-            return (T)this;
-        }
-
-        public T onChange(String onChange)
-        {
-            _onChange = onChange;
-            return (T)this;
-        }
-
-        public T onFocus(String onFocus)
-        {
-            _onFocus = onFocus;
-            return (T)this;
-        }
-
-        public T onKeyUp(String onKeyUp)
-        {
-            _onKeyUp = onKeyUp;
-            return (T)this;
-        }
-
-        public T placeholder(String placeholder)
-        {
-            _placeholder = placeholder;
-            return (T)this;
-        }
-
-        public T required(Boolean required)
-        {
-            _required = required;
-            return (T)this;
-        }
-
-        public T readOnly(Boolean readOnly)
-        {
-            _readOnly = readOnly;
-            return (T)this;
-        }
-
-        public T size(Integer size)
-        {
-            _size = size;
-            return (T)this;
-        }
-
-        public T maxLength(Integer maxLength)
-        {
-            _maxLength = maxLength;
-            return (T)this;
-        }
-
-        public T state(State state)
-        {
-            _state = state;
-            return (T)this;
-        }
-
-        public T showLabel(Boolean showLabel)
-        {
-            _showLabel = showLabel;
-            return (T)this;
-        }
-
-        public T type(String type)
-        {
-            if (type != null) // prevent clearing default
-                _type = type;
-            return (T)this;
-        }
-
-        public T value(@Nullable HtmlString value)
-        {
-            _value = value;
-            return (T)this;
-        }
-
-        public T value(@Nullable HasHtmlString hhs)
-        {
-            _value = null != hhs ? hhs.getHtmlString() : null;
-            return (T)this;
-        }
-
-        public T value(String value)
-        {
-            _value = null != value ? HtmlString.of(value) : null;
-            return (T)this;
-        }
-
-        public T value(int value)
-        {
-            _value = HtmlString.unsafe(String.valueOf(value));
-            return (T)this;
-        }
-
-        public T needsWrapping(Boolean wrapped)
-        {
-            _needsWrapping = wrapped;
-            return (T)this;
-        }
-
-        public T autoComplete(String autoComplete)
-        {
-            _autoComplete = autoComplete;
-            return (T)this;
-        }
-
-        public T dirName(String dirName)
-        {
-            _dirName = dirName;
-            return (T)this;
-        }
-
-        public T form(String form)
-        {
-            _form = form;
-            return (T)this;
-        }
-
-        public T formAction(String formAction)
-        {
-            _formAction = formAction;
-            return (T)this;
-        }
-
-        public T formEncodingType(String formEncodingType)
-        {
-            _formEncodingType = formEncodingType;
-            return (T)this;
-        }
-
-        public T formMethod(String formMethod)
-        {
-            _formMethod = formMethod;
-            return (T)this;
-        }
-
-        public T formNoValidate(Boolean formNoValidate)
-        {
-            _formNoValidate = formNoValidate;
-            return (T)this;
-        }
-
-        public T formTarget(String formTarget)
-        {
-            _formTarget = formTarget;
-            return (T)this;
-        }
-
-        public T autoFocus(Boolean autoFocus)
-        {
-            _autoFocus = autoFocus;
-            return (T)this;
-        }
-
-        public T multiple(Boolean multiple)
-        {
-            _multiple = multiple;
-            return (T)this;
-        }
-
-        public T dataList(String dataList)
-        {
-            _dataList = dataList;
-            return (T)this;
-        }
-
-        public T maxValue(String maxValue)
-        {
-            _max = maxValue;
-            return (T)this;
-        }
-
-        public T minValue(String minValue)
-        {
-            _min = minValue;
-            return (T)this;
-        }
-
-        public T regularExpression(String regularExpression)
-        {
-            _regExp = regularExpression;
-            return (T)this;
-        }
-
-        public T stepValue(Integer stepValue)
-        {
-            _step = stepValue;
-            return (T)this;
-        }
-
-        public T tabIndex(Integer tabIndex)
-        {
-            _tabIndex = tabIndex;
-            return (T)this;
-        }
-
-        public T addStyle(String style)
-        {
-            _styles.add(style);
-            return (T)this;
-        }
-
-        public T addStyles(List<String> styles)
-        {
-            _styles.addAll(styles);
-            return (T)this;
-        }
-
-        // Add an arbitrary "data-" attribute. Name should not include "data-"... the builder will add prefix.
-        public T addDataAttribute(@NotNull String name, @NotNull String value)
-        {
-            _dataAttributes.add(new DataAttribute(name, value));
-            return (T)this;
-        }
-
-        public Input build()
-        {
-            return new Input(this);
-        }
-
-        @Override
-        public String toString()
-        {
-            return build().toString();
-        }
-
-        @Override
-        public HtmlString getHtmlString()
-        {
-            return build().getHtmlString();
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/util/element/Option.java b/api/src/org/labkey/api/util/element/Option.java
deleted file mode 100644
index b818f7132cb..00000000000
--- a/api/src/org/labkey/api/util/element/Option.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2017-2018 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util.element;
-
-import org.jetbrains.annotations.Nullable;
-import org.labkey.api.util.HasHtmlString;
-import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.SafeToRender;
-
-import jakarta.validation.constraints.NotNull;
-
-public class Option implements HasHtmlString, SafeToRender
-{
-    private final @NotNull HtmlString _label;
-    private final @NotNull String _value;
-    private final boolean _disabled;
-    private final boolean _selected;
-
-    private Option(OptionBuilder builder)
-    {
-        _label = builder._label;
-        _value = builder._value;
-        _disabled = builder._disabled;
-        _selected = builder._selected;
-    }
-
-    public boolean isDisabled()
-    {
-        return _disabled;
-    }
-
-    public HtmlString getLabel()
-    {
-        return _label;
-    }
-
-    public boolean isSelected()
-    {
-        return _selected;
-    }
-
-    public @NotNull String getValue()
-    {
-        return _value;
-    }
-
-    public HtmlString render(boolean forceSelected)
-    {
-        // TODO: This method should do the rendering via DOM or HtmlStringBuilder
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("<option")
-            .append(" value=\"").append(PageFlowUtil.filter(getValue())).append("\"");
-
-        if (isDisabled())
-            sb.append(" disabled");
-
-        if (forceSelected || isSelected())
-            sb.append(" selected");
-
-        sb.append(">");
-
-        if (!HtmlString.EMPTY_STRING.equals(getLabel()))
-            sb.append(getLabel());
-
-        sb.append("</option>");
-
-        return HtmlString.unsafe(sb.toString());
-    }
-
-    @Override
-    public HtmlString getHtmlString()
-    {
-        return render(false);
-    }
-
-    @Override
-    public String toString()
-    {
-        return getHtmlString().toString();
-    }
-
-    public static class OptionBuilder implements HasHtmlString, SafeToRender
-    {
-        private @NotNull HtmlString _label;
-        private @NotNull String _value;
-        private boolean _disabled;
-        private boolean _selected;
-
-        public OptionBuilder()
-        {
-            _label = HtmlString.EMPTY_STRING;
-        }
-
-        public OptionBuilder(String label, @Nullable Object value)
-        {
-            label(label);
-            value(value);
-        }
-
-        public OptionBuilder disabled(boolean disabled)
-        {
-            _disabled = disabled;
-            return this;
-        }
-
-        public OptionBuilder label(String label)
-        {
-            _label = HtmlString.of(label);
-            return this;
-        }
-
-        public OptionBuilder label(@NotNull HtmlString label)
-        {
-            assert null != label;
-            _label = label;
-            return this;
-        }
-
-        public OptionBuilder selected(boolean selected)
-        {
-            _selected = selected;
-            return this;
-        }
-
-        public OptionBuilder value(@Nullable Object value)
-        {
-            _value = null == value ? "" : value.toString();
-            return this;
-        }
-
-        public Option build()
-        {
-            return new Option(this);
-        }
-
-        @Override
-        public String toString()
-        {
-            return getHtmlString().toString();
-        }
-
-        @Override
-        public HtmlString getHtmlString()
-        {
-            return build().getHtmlString();
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/util/element/Select.java b/api/src/org/labkey/api/util/element/Select.java
deleted file mode 100644
index e42b8c80b52..00000000000
--- a/api/src/org/labkey/api/util/element/Select.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2017-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util.element;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.labkey.api.util.element.Option.OptionBuilder;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-public class Select extends Input
-{
-    private final boolean _multiple;
-    private final List<Option> _options;
-    private final String _selected;
-
-    private Select(SelectBuilder builder)
-    {
-        super(builder);
-        _multiple = builder._multiple;
-        _options = builder._options;
-        _selected = builder._selected;
-    }
-
-    @Override
-    public boolean isMultiple()
-    {
-        return _multiple;
-    }
-
-    public @NotNull List<Option> getOptions()
-    {
-        return _options;
-    }
-
-    @Override
-    protected void doInput(Appendable sb) throws IOException
-    {
-        var id = StringUtils.defaultIfBlank(getId(), generateId("select"));
-
-        sb.append("<select").append(" id=\"").append(h(id)).append("\" name=\"").append(h(getName())).append("\"");
-
-        if (StringUtils.isNotEmpty(getClassName()))
-            sb.append(" class=\"").append(h(getClassName())).append("\"");
-        if (StringUtils.isNotEmpty(getPlaceholder()))
-            sb.append(" placeholder=\"").append(h(getPlaceholder())).append("\"");
-        if (getSize() != null)
-            sb.append(" size=\"").append(h(getSize())).append("\"");
-        if (isMultiple())
-            sb.append(" multiple");
-
-        doStyles(sb);
-
-        doDataAttributes(sb);
-
-        doInputEvents(id);
-
-        if (isDisabled())
-            sb.append(" disabled");
-
-        sb.append(">");
-
-        doOptions(sb);
-
-        sb.append("</select>");
-    }
-
-    private void doOptions(Appendable sb) throws IOException
-    {
-        for (Option o : getOptions())
-        {
-            if (o != null)
-            {
-                boolean forceSelected = null != _selected && _selected.equals(o.getValue());
-                sb.append(h(o.render(forceSelected)));
-            }
-        }
-    }
-
-    public static class SelectBuilder extends InputBuilder<SelectBuilder>
-    {
-        private final List<Option> _options = new ArrayList<>();
-
-        private boolean _multiple;
-        // Alternative way to specify the selected option - useful when adding options as Strings or Objects
-        private String _selected = null;
-
-        public SelectBuilder()
-        {
-        }
-
-        /**
-         * Adds a single option, either a previously created Option object or a new Option where the key is set to the value.
-         * @param option An Option, String, or Object
-         * @return The SelectBuilder
-         */
-        public SelectBuilder addOption(Object option)
-        {
-            return addOptions(Stream.of(option));
-        }
-
-        /**
-         * Adds a single Option built from an OptionBuilder, as a convenience.
-         * @param  builder An OptionBuilder
-         * @return The SelectBuilder
-         */
-        public SelectBuilder addOption(OptionBuilder builder)
-        {
-            return addOptions(Stream.of(builder.build()));
-        }
-
-        /**
-         * Adds a single option with the specified label and value.
-         * @param label The new option's label
-         * @param value The new option's value
-         * @return The SelectBuilder
-         */
-        public SelectBuilder addOption(String label, String value)
-        {
-            return addOption(new OptionBuilder(label, value));
-        }
-
-        /**
-         * Adds multiple options to the &lt;select> elements by supplying a collection of objects. See {@link #addOptions(Stream)}
-         * for more details.
-         * @param options A collection of Options, OptionBuilders, Strings, or Objects
-         * @return The SelectBuilder
-         */
-        public SelectBuilder addOptions(@NotNull Collection<?> options)
-        {
-            return addOptions(options.stream());
-        }
-
-        /**
-         * Adds multiple options to the &lt;select> element by supplying a {@code Stream<Object>}. If the {@code Stream}
-         * elements are {@code Option} objects then they are simply added. If the elements are {@code OptionBuilder}
-         * objects then new {@code Option} objects are built and added. If the elements are {@code String} or
-         * {@code Object} then new {@code Option} objects are created and added; in this case, the key and value are both
-         * set to the String value of each object.
-         *
-         * @param options A {@code Stream} of Options, OptionBuilders, Strings, or Objects
-         * @return This SelectBuilder
-         */
-        public SelectBuilder addOptions(@NotNull Stream<?> options)
-        {
-            options
-                .filter(Objects::nonNull)
-                .map(o -> {
-                    if (o instanceof Option)
-                    {
-                        return (Option) o;
-                    }
-                    else if (o instanceof OptionBuilder)
-                    {
-                        return ((OptionBuilder) o).build();
-                    }
-                    else
-                    {
-                        String value = o.toString();
-                        return new OptionBuilder(value, value).build();
-                    }
-
-                })
-                .forEach(_options::add);
-
-            return this;
-        }
-
-        /**
-         * Add multiple options from a map
-         * @param options A Map&lt;option value, option label>
-         * @return The SelectBuilder
-         */
-        public SelectBuilder addOptions(Map<?, String> options)
-        {
-            return addOptions(
-                options.entrySet().stream()
-                    .map(e->new OptionBuilder(e.getValue(), e.getKey()).build())
-            );
-        }
-
-        public SelectBuilder multiple(boolean multiple)
-        {
-            _multiple = multiple;
-            return this;
-        }
-
-        public SelectBuilder selected(@Nullable Object key)
-        {
-            _selected = null != key ? key.toString() : null;
-            return this;
-        }
-
-        @Override
-        public Select build()
-        {
-            return new Select(this);
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/util/element/TextArea.java b/api/src/org/labkey/api/util/element/TextArea.java
deleted file mode 100644
index 56754b35dcc..00000000000
--- a/api/src/org/labkey/api/util/element/TextArea.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2017-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.labkey.api.util.element;
-
-import org.apache.commons.lang3.StringUtils;
-import org.labkey.api.util.HtmlString;
-
-import java.io.IOException;
-
-public class TextArea extends Input
-{
-    private final int _columns;
-    private final int _rows;
-
-    private TextArea(TextAreaBuilder builder)
-    {
-        super(builder);
-        _columns = builder._columns == null ? -1 : builder._columns;
-        _rows = builder._rows == null ? -1 : builder._rows;
-    }
-
-    public int getColumns()
-    {
-        return _columns;
-    }
-
-    public int getRows()
-    {
-        return _rows;
-    }
-
-    @Override
-    protected void doInput(Appendable sb) throws IOException
-    {
-        var id = generateId("textarea");
-        sb.append("<textarea id=\"").append(h(id)).append("\" name=\"").append(h(getName())).append("\"");
-
-        if (getColumns() != -1)
-            sb.append(" cols=\"").append(h(getColumns())).append("\"");
-        if (getRows() != -1)
-            sb.append(" rows=\"").append(h(getRows())).append("\"");
-
-        if (StringUtils.isNotEmpty(getId()))
-            sb.append(" id=\"").append(h(getId())).append("\"");
-        if (StringUtils.isNotEmpty(getClassName()))
-            sb.append(" class=\"").append(h(getClassName())).append("\"");
-        if (StringUtils.isNotEmpty(getPlaceholder()))
-            sb.append(" placeholder=\"").append(h(getPlaceholder())).append("\"");
-
-        doInputEvents(id);
-
-        if (isDisabled())
-            sb.append(" disabled");
-
-        sb.append(">");
-
-        if (!HtmlString.isEmpty(getValue()))
-            sb.append(h(getValue()));
-
-        sb.append("</textarea>");
-    }
-
-    public static class TextAreaBuilder extends InputBuilder<TextAreaBuilder>
-    {
-        private Integer _columns;
-        private Integer _rows;
-
-        public TextAreaBuilder columns(Integer columns)
-        {
-            _columns = columns;
-            return this;
-        }
-
-        public TextAreaBuilder rows(Integer rows)
-        {
-            _rows = rows;
-            return this;
-        }
-
-        @Override
-        public TextArea build()
-        {
-            return new TextArea(this);
-        }
-    }
-}
diff --git a/api/src/org/labkey/api/view/HttpPostRedirectView.java b/api/src/org/labkey/api/view/HttpPostRedirectView.java
index f5cc8bcccf9..09752a88c70 100644
--- a/api/src/org/labkey/api/view/HttpPostRedirectView.java
+++ b/api/src/org/labkey/api/view/HttpPostRedirectView.java
@@ -17,7 +17,7 @@
 
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 
 import java.io.PrintWriter;
 import java.util.Collection;
diff --git a/api/src/org/labkey/api/view/NavTree.java b/api/src/org/labkey/api/view/NavTree.java
index 725a3290a39..e4fe89ccc63 100644
--- a/api/src/org/labkey/api/view/NavTree.java
+++ b/api/src/org/labkey/api/view/NavTree.java
@@ -21,7 +21,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.URLHelper;
 
diff --git a/api/src/org/labkey/api/view/PopupMenu.java b/api/src/org/labkey/api/view/PopupMenu.java
index 44125466b15..b7d290af31d 100644
--- a/api/src/org/labkey/api/view/PopupMenu.java
+++ b/api/src/org/labkey/api/view/PopupMenu.java
@@ -19,7 +19,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.ActionButton;
 import org.labkey.api.data.RenderContext;
-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.UniqueID;
@@ -149,7 +149,7 @@ else if (_buttonStyle == ButtonStyle.MENUBUTTON)
                     if (requiresSelection)
                         attributes.put("data-labkey-requires-selection", dataRegionName);
 
-                    Button.ButtonBuilder bldr = PageFlowUtil.button(_navTree.getText())
+                    ButtonBuilder bldr = PageFlowUtil.button(_navTree.getText())
                         .dropdown(true)
                         .onClick(onClickScript)
                         .attributes(attributes);
diff --git a/api/src/org/labkey/api/view/PopupMenuView.java b/api/src/org/labkey/api/view/PopupMenuView.java
index 95abf53ab0f..4d0323aad91 100644
--- a/api/src/org/labkey/api/view/PopupMenuView.java
+++ b/api/src/org/labkey/api/view/PopupMenuView.java
@@ -19,9 +19,9 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.io.IOException;
@@ -207,8 +207,7 @@ private static void renderMenuFilterInput(String menuFilterItemCls, HtmlWriter o
     {
         LI(
             cl("menu-filter-input"),
-            new Input.InputBuilder<>()
-                .type("text")
+            InputBuilder.text()
                 .placeholder("Filter")
                 .className("dropdown-menu-filter")
                 .addDataAttribute("filter-item", menuFilterItemCls)
diff --git a/api/src/org/labkey/api/view/Portal.java b/api/src/org/labkey/api/view/Portal.java
index f2c788fad83..a4545fca20a 100644
--- a/api/src/org/labkey/api/view/Portal.java
+++ b/api/src/org/labkey/api/view/Portal.java
@@ -65,14 +65,14 @@
 import org.labkey.api.security.permissions.Permission;
 import org.labkey.api.security.roles.RoleManager;
 import org.labkey.api.usageMetrics.UsageMetricsProvider;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.GUID;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.ModuleChangeListener;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 import org.labkey.api.util.logging.LogHelper;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValues;
@@ -1346,7 +1346,7 @@ private static HtmlString addWebPartWidget(AddWebParts bean, ViewContext viewCon
                                         ),
                                         SPAN(
                                                 cl("input-group-button"),
-                                                new Button.ButtonBuilder("Add").submit(true).build()
+                                                new ButtonBuilder("Add").submit(true).build()
                                         )
                                 )
                         )
diff --git a/assay/api-src/org/labkey/api/assay/plate/PlateSampleFilePropertyHelper.java b/assay/api-src/org/labkey/api/assay/plate/PlateSampleFilePropertyHelper.java
index 8fc1b23943d..86620eef229 100644
--- a/assay/api-src/org/labkey/api/assay/plate/PlateSampleFilePropertyHelper.java
+++ b/assay/api-src/org/labkey/api/assay/plate/PlateSampleFilePropertyHelper.java
@@ -41,7 +41,7 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.JavaScriptFragment;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.element.Input.InputBuilder;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.InsertView;
 import org.labkey.api.view.template.PageConfig;
@@ -376,7 +376,7 @@ function showMetadataPicker(showFilePicker) {
 
                         TABLE(
                             TR(
-                                TD(new InputBuilder<>().type("radio").id("optionPrevUpload").name(METADATA_PROVIDER_INPUT_NAME).value(METADATA_PROVIDER_OPTION_PREVUPLOAD).checked(true)),
+                                TD(InputBuilder.radio().id("optionPrevUpload").name(METADATA_PROVIDER_INPUT_NAME).value(METADATA_PROVIDER_OPTION_PREVUPLOAD).checked(true)),
                                 TD("Use the metadata that was already uploaded to the server")
                             ),
                             TR(
@@ -390,8 +390,8 @@ function showMetadataPicker(showFilePicker) {
                             ),
                             TR(
                                 TD(
-                                        new InputBuilder<>().type("hidden").name(METADATA_PREVUPLOAD_LOCATION).value(filePath),
-                                        new InputBuilder<>().type("radio").id("optionNewUpload").name(METADATA_PROVIDER_INPUT_NAME).value(METADATA_PROVIDER_OPTION_NEWUPLOAD)
+                                    InputBuilder.hidden().name(METADATA_PREVUPLOAD_LOCATION).value(filePath),
+                                    InputBuilder.radio().id("optionNewUpload").name(METADATA_PROVIDER_INPUT_NAME).value(METADATA_PROVIDER_OPTION_NEWUPLOAD)
                                 ),
                                 TD("Upload a data file")
                             ),
@@ -400,7 +400,7 @@ function showMetadataPicker(showFilePicker) {
                                 TD(
                                     DIV(
                                         id("newMetadataFileName").at(style, "display:none"),
-                                        new InputBuilder<>().type("file").id(SAMPLE_FILE_INPUT_NAME).name(SAMPLE_FILE_INPUT_NAME).size(40).addStyle("border: none")
+                                        InputBuilder.file().id(SAMPLE_FILE_INPUT_NAME).name(SAMPLE_FILE_INPUT_NAME).size(40).addStyle("border: none")
                                     )
                                 )
                             )
@@ -415,8 +415,8 @@ function showMetadataPicker(showFilePicker) {
                             TR(
                                 TD(),
                                 TD(
-                                    new InputBuilder<>().type("hidden").name(METADATA_PROVIDER_INPUT_NAME).value(METADATA_PROVIDER_OPTION_NEWUPLOAD),
-                                    new InputBuilder<>().type("file").name(SAMPLE_FILE_INPUT_NAME).size(40).addStyle("border: none")
+                                    InputBuilder.hidden().name(METADATA_PROVIDER_INPUT_NAME).value(METADATA_PROVIDER_OPTION_NEWUPLOAD),
+                                    InputBuilder.file().name(SAMPLE_FILE_INPUT_NAME).size(40).addStyle("border: none")
                                 )
                             )
                         ).appendTo(out);
diff --git a/assay/src/org/labkey/assay/plate/view/plateList.jsp b/assay/src/org/labkey/assay/plate/view/plateList.jsp
index dc599bbdab0..e8cbce9e12d 100644
--- a/assay/src/org/labkey/assay/plate/view/plateList.jsp
+++ b/assay/src/org/labkey/assay/plate/view/plateList.jsp
@@ -22,16 +22,16 @@
 <%@ page import="org.labkey.api.security.permissions.DeletePermission" %>
 <%@ page import="org.labkey.api.security.permissions.InsertPermission" %>
 <%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
-<%@ page import="org.labkey.api.util.Link" %>
-<%@ page import="org.labkey.api.util.element.Input" %>
-<%@ page import="org.labkey.api.util.element.Option" %>
-<%@ page import="org.labkey.api.util.element.Select" %>
+<%@ page import="org.labkey.api.util.InputBuilder.Input" %>
+<%@ page import="org.labkey.api.util.LinkBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder.Option" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.assay.PlateController" %>
 <%@ page import="org.labkey.assay.plate.PlateManager" %>
-<%@ page import="java.lang.Integer" %>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.List" %>
@@ -118,7 +118,7 @@
             if (layout.name() != null)
                 designerURL.replaceParameter("templateType", layout.name());
 
-            options.add(new Option.OptionBuilder()
+            options.add(new OptionBuilder()
                     .label("new " + layout.description() + " template")
                     .value(designerURL.toString())
                     .build());
@@ -126,7 +126,7 @@
 %>
 <h4>Create New Plate</h4>
 <labkey:form method="POST" layout="inline" id="qc_form">
-    <%= new Select.SelectBuilder()
+    <%= new SelectBuilder()
             .name("template")
             .id("plate_template")
             .layout(Input.Layout.INLINE)
@@ -154,7 +154,7 @@
     {
         Integer runCount = plateRunCount.get(plate);
 
-        Link.LinkBuilder editLink = new Link.LinkBuilder("edit");
+        LinkBuilder editLink = new LinkBuilder("edit");
         if (runCount > 0)
         {
             editLink.tooltip("Plate template is used by " + runCount + " runs and can't be edited")
@@ -198,7 +198,7 @@
             {
                 if (plates.size() > 1)
                 {
-                    Link.LinkBuilder deleteLink = new Link.LinkBuilder("delete");
+                    LinkBuilder deleteLink = new LinkBuilder("delete");
                     if (runCount > 0)
                     {
                         deleteLink.tooltip("Plate template is used by " + runCount + " runs and can't be deleted")
diff --git a/assay/src/org/labkey/assay/view/updateQCState.jsp b/assay/src/org/labkey/assay/view/updateQCState.jsp
index 7abe88d625b..7a28b50d295 100644
--- a/assay/src/org/labkey/assay/view/updateQCState.jsp
+++ b/assay/src/org/labkey/assay/view/updateQCState.jsp
@@ -19,9 +19,9 @@
 <%@ page import="org.labkey.api.exp.api.ExpRun" %>
 <%@ page import="org.labkey.api.exp.api.ExperimentService" %>
 <%@ page import="org.labkey.api.qc.DataState" %>
-<%@ page import="org.labkey.api.util.element.Input" %>
-<%@ page import="org.labkey.api.util.element.Select" %>
-<%@ page import="org.labkey.api.util.element.TextArea" %>
+<%@ page import="org.labkey.api.util.InputBuilder.Input" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
+<%@ page import="org.labkey.api.util.TextAreaBuilder" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.assay.AssayController.UpdateQCStateForm" %>
@@ -145,7 +145,7 @@
         }
     %>
 
-    <%= new Select.SelectBuilder().name("state").id("stateInput").label("New State *")
+    <%= new SelectBuilder().name("state").id("stateInput").label("New State *")
             .layout(Input.Layout.HORIZONTAL)
             .required(true)
             .contextContent("The QC State to assign to the selected run(s)")
@@ -157,7 +157,7 @@
         String commentLabel = requireComment ? "Comment *" : "Comment";
         String commentHelpTip = requireComment ? "A comment is required when changing a QC State for the selected run(s)." : null;
     %>
-    <%= new TextArea.TextAreaBuilder().name("comment").id("commentInput").label(commentLabel)
+    <%= new TextAreaBuilder().name("comment").id("commentInput").label(commentLabel)
             .layout(Input.Layout.HORIZONTAL)
             .value(form.getComment())
             .required(requireComment)
diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
index 54a0b6f9da7..95586b603b0 100644
--- a/core/src/org/labkey/core/admin/AdminController.java
+++ b/core/src/org/labkey/core/admin/AdminController.java
@@ -240,7 +240,7 @@
 import org.labkey.api.settings.WriteableAppProps;
 import org.labkey.api.settings.WriteableFolderLookAndFeelProperties;
 import org.labkey.api.settings.WriteableLookAndFeelProperties;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ConfigurationException;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.DateUtil;
@@ -255,7 +255,7 @@
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.HttpsUtil;
 import org.labkey.api.util.JsonUtil;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.MailHelper;
 import org.labkey.api.util.MemTracker;
 import org.labkey.api.util.MemTracker.HeldReference;
@@ -4230,7 +4230,7 @@ public ModelAndView getView(MemoryStressForm memoryStressForm, boolean reshow, B
                                     DOM.TR(DOM.TD("Delay between iterations (ms)"), DOM.TD(DOM.INPUT(at(name, "delay", value, memoryStressForm._delay)))),
                                     DOM.TR(DOM.TD("Percent churn per iteration (0.0 - 1.0)"), DOM.TD(DOM.INPUT(at(name, "percentChurn", value, memoryStressForm._percentChurn))))
                             ),
-                            new Button.ButtonBuilder("Perform stress test").submit(true).build())
+                            new ButtonBuilder("Perform stress test").submit(true).build())
             );
         }
 
@@ -4582,7 +4582,7 @@ else if (fixRequested.equalsIgnoreCase("descriptor"))
                         currentUrl.addParameter("_fix", "container");
                         contentBuilder.unsafeAppend("<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;")
                             .append(" click ")
-                            .append(new LinkBuilder("here").href(currentUrl).clearClasses())
+                            .append(LinkBuilder.simpleLink("here", currentUrl))
                             .append(" to attempt recovery.");
                     }
 
@@ -4597,7 +4597,7 @@ else if (fixRequested.equalsIgnoreCase("descriptor"))
                         currentUrl.addParameter("_fix", "descriptor");
                         contentBuilder.unsafeAppend("<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;")
                             .append(" click ")
-                            .append(new LinkBuilder("here").href(currentUrl).clearClasses())
+                            .append(LinkBuilder.simpleLink("here", currentUrl))
                             .append(" to attempt recovery.");
                     }
 
diff --git a/core/src/org/labkey/core/admin/customizeMenu.jsp b/core/src/org/labkey/core/admin/customizeMenu.jsp
index 335960822dd..38fd357bf96 100644
--- a/core/src/org/labkey/core/admin/customizeMenu.jsp
+++ b/core/src/org/labkey/core/admin/customizeMenu.jsp
@@ -29,7 +29,7 @@
     }
 %>
 <%
-    JspView<CustomizeMenuForm> me = (JspView<CustomizeMenuForm>) JspView.currentView();
+    JspView<CustomizeMenuForm> me = JspView.currentView();
     CustomizeMenuForm bean = me.getModelBean();
 %>
 <div id="someUniqueElement2"></div>
diff --git a/core/src/org/labkey/core/admin/rConfiguration.jsp b/core/src/org/labkey/core/admin/rConfiguration.jsp
index 0af6d6ab037..9538da7cfe6 100644
--- a/core/src/org/labkey/core/admin/rConfiguration.jsp
+++ b/core/src/org/labkey/core/admin/rConfiguration.jsp
@@ -20,7 +20,7 @@
 <%@ page import="org.labkey.api.reports.ExternalScriptEngineDefinition" %>
 <%@ page import="org.labkey.api.reports.LabKeyScriptEngineManager" %>
 <%@ page import="org.labkey.api.reports.report.r.RemoteRNotEnabledException" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
diff --git a/core/src/org/labkey/core/admin/sql/SqlScriptController.java b/core/src/org/labkey/core/admin/sql/SqlScriptController.java
index 9721da906be..66ad0761073 100644
--- a/core/src/org/labkey/core/admin/sql/SqlScriptController.java
+++ b/core/src/org/labkey/core/admin/sql/SqlScriptController.java
@@ -61,7 +61,7 @@
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.TestContext;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 import org.labkey.api.vcs.Vcs;
 import org.labkey.api.vcs.VcsService;
 import org.labkey.api.view.ActionURL;
diff --git a/core/src/org/labkey/core/admin/systemMaintenance.jsp b/core/src/org/labkey/core/admin/systemMaintenance.jsp
index b8bba13582a..b945402c86a 100644
--- a/core/src/org/labkey/core/admin/systemMaintenance.jsp
+++ b/core/src/org/labkey/core/admin/systemMaintenance.jsp
@@ -82,8 +82,8 @@
             <tr>
                 <td colspan="2">The following tasks are (typically) run every night to clear unused data, update database
                     statistics, perform nightly data refreshes, and generally keep this server running smoothly and quickly.
-                    Log files and outputs generated by the tasks are written to the <%=link("@files directory of the site file root",
-                    urlProvider(FileUrls.class).urlBegin(ContainerManager.getRoot())).clearClasses()%>. We recommend leaving all system
+                    Log files and outputs generated by the tasks are written to the <%=simpleLink("@files directory of the site file root",
+                    urlProvider(FileUrls.class).urlBegin(ContainerManager.getRoot()))%>. We recommend leaving all system
                     maintenance tasks enabled, but tasks can be disabled if absolutely necessary. See the LabKey documentation
                     for <%=helpLink("systemMaint", "more information.")%></td>
             </tr>
diff --git a/core/src/org/labkey/core/project/folderNav.jsp b/core/src/org/labkey/core/project/folderNav.jsp
index b42f9714895..fae53817787 100644
--- a/core/src/org/labkey/core/project/folderNav.jsp
+++ b/core/src/org/labkey/core/project/folderNav.jsp
@@ -47,7 +47,7 @@
     {
         if (c.hasPermission(u, ReadPermission.class))
         {
-            return HtmlStringBuilder.of(link(c.getTitle(), c.getStartURL(u)).clearClasses()).append(getTrailSeparator()).getHtmlString();
+            return HtmlStringBuilder.of(simpleLink(c.getTitle(), c.getStartURL(u))).append(getTrailSeparator()).getHtmlString();
         }
         return HtmlStringBuilder.of().startTag("span").append(c.getTitle()).endTag("span").append(getTrailSeparator()).getHtmlString();
     }
diff --git a/core/src/org/labkey/core/query/PostgresStatActivityTable.java b/core/src/org/labkey/core/query/PostgresStatActivityTable.java
index 5097a283b94..144548248d8 100644
--- a/core/src/org/labkey/core/query/PostgresStatActivityTable.java
+++ b/core/src/org/labkey/core/query/PostgresStatActivityTable.java
@@ -28,7 +28,7 @@
 import org.labkey.api.security.permissions.ApplicationAdminPermission;
 import org.labkey.api.security.permissions.DeletePermission;
 import org.labkey.api.security.permissions.Permission;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
@@ -239,7 +239,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
                 oldWriter.write(separator);
                 ActionURL url = new ActionURL(AdminController.ShowThreadsAction.class, ContainerManager.getRoot());
                 url.setFragment(thread.getName());
-                oldWriter.write(new Link.LinkBuilder(thread.getName()).href(url).target("_blank").renderToString());
+                oldWriter.write(new LinkBuilder(thread.getName()).href(url).target("_blank").renderToString());
                 separator = "\n<br/>";
 
                 // Check for HTTP threads and their async counterparts to tie queries to the request that spawned them
diff --git a/core/src/org/labkey/core/security/addUsers.jsp b/core/src/org/labkey/core/security/addUsers.jsp
index 150a67a66a9..80dcd6df68f 100644
--- a/core/src/org/labkey/core/security/addUsers.jsp
+++ b/core/src/org/labkey/core/security/addUsers.jsp
@@ -16,7 +16,7 @@
  */
 %>
 <%@ page import="org.labkey.api.security.AuthenticationManager" %>
-<%@ page import="org.labkey.api.util.Button.ButtonBuilder" %>
+<%@ page import="org.labkey.api.util.ButtonBuilder" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
diff --git a/core/src/org/labkey/core/view/styleGuide.jsp b/core/src/org/labkey/core/view/styleGuide.jsp
index 0936d10fec8..034a31a6871 100644
--- a/core/src/org/labkey/core/view/styleGuide.jsp
+++ b/core/src/org/labkey/core/view/styleGuide.jsp
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.util.element.Input" %>
-<%@ page import="org.labkey.api.util.element.Option" %>
-<%@ page import="org.labkey.api.util.element.Select" %>
+<%@ page import="org.labkey.api.util.DOM" %>
+<%@ page import="org.labkey.api.util.HtmlString" %>
+<%@ page import="org.labkey.api.util.InputBuilder.Input" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
-<%@ page import="org.labkey.api.util.HtmlString" %>
-<%@ page import="org.labkey.api.util.DOM" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%!
@@ -255,13 +255,13 @@
                 <labkey:input name="required" label="Required" isRequired="true" id="required1" placeholder="I need a value"/>
                 <labkey:input name="readOnly" label="Read Only" isReadOnly="true" id="readOnly1" value="You can only read me"/>
                 <% /* This is an example of a select builder -- hopefully can be replaced soon with a <labkey:select> */ %>
-                <%= new Select.SelectBuilder().name("selectfield").label("Nominal select")
+                <%= new SelectBuilder().name("selectfield").label("Nominal select")
                         .layout(Input.Layout.HORIZONTAL)
                         .formGroup(true)
-                        .addOption(new Option.OptionBuilder().build())
-                        .addOption(new Option.OptionBuilder().value("BMW").label("Beemer").build())
-                        .addOption(new Option.OptionBuilder().value("VW").label("Volkswagen").build())
-                        .addOption(new Option.OptionBuilder().value("GM").label("General Motors").build())
+                        .addOption(new OptionBuilder().build())
+                        .addOption(new OptionBuilder().value("BMW").label("Beemer").build())
+                        .addOption(new OptionBuilder().value("VW").label("Volkswagen").build())
+                        .addOption(new OptionBuilder().value("GM").label("General Motors").build())
                 %>
                 <labkey:input name="test" label="HTML5 attributes" autoComplete="on" isAutoFocused="true" isMultiple="true" pattern="[A-Za-z]{3}" placeholder="3 letter country code"/>
                 <button type="submit" class="btn btn-default">Invite</button>
@@ -316,19 +316,19 @@
         <br>
         <h2>Schema/Query Select Inputs</h2>
         <labkey:form>
-            <%= new Select.SelectBuilder().id("schemaNameInput").label("Schema")
+            <%= new SelectBuilder().id("schemaNameInput").label("Schema")
                     .layout(Input.Layout.HORIZONTAL)
                     .formGroup(true)
                     .disabled(true)
             %>
 
-            <%= new Select.SelectBuilder().id("queryNameInput").label("Query")
+            <%= new SelectBuilder().id("queryNameInput").label("Query")
                     .layout(Input.Layout.HORIZONTAL)
                     .formGroup(true)
                     .disabled(true)
             %>
 
-            <%= new Select.SelectBuilder().id("columnInput").label("Column")
+            <%= new SelectBuilder().id("columnInput").label("Column")
                     .layout(Input.Layout.HORIZONTAL)
                     .formGroup(true)
                     .disabled(true)
diff --git a/core/src/org/labkey/core/view/template/bootstrap/CoreWarningProvider.java b/core/src/org/labkey/core/view/template/bootstrap/CoreWarningProvider.java
index 0ac526c6b65..a1c8d1f3e7b 100644
--- a/core/src/org/labkey/core/view/template/bootstrap/CoreWarningProvider.java
+++ b/core/src/org/labkey/core/view/template/bootstrap/CoreWarningProvider.java
@@ -41,7 +41,7 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JobRunner;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.MothershipReport;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.StringUtilsLabKey;
@@ -156,7 +156,7 @@ public void addDynamicWarnings(@NotNull Warnings warnings, @Nullable ViewContext
             if (null == upgradeMessage && showAllWarnings)
             {
                 // Mock upgrade message for testing
-                upgradeMessage = HtmlStringBuilder.of("You really ought to upgrade this server! ").append(new LinkBuilder("Click here!").href(AppProps.getInstance().getHomePageActionURL()).clearClasses()).getHtmlString();
+                upgradeMessage = HtmlStringBuilder.of("You really ought to upgrade this server! ").append(LinkBuilder.simpleLink("Click here!", AppProps.getInstance().getHomePageActionURL())).getHtmlString();
             }
 
             if (null != upgradeMessage)
@@ -372,7 +372,7 @@ private void getProbableLeakCountWarnings(Warnings warnings, boolean showAllWarn
             if (showAllWarnings || leakCount > 0)
             {
                 int count = ConnectionWrapper.getActiveConnectionCount();
-                HtmlStringBuilder html = HtmlStringBuilder.of(new LinkBuilder(count + " DB connection" + (count == 1 ? "" : "s") + " in use.").href(PageFlowUtil.urlProvider(AdminUrls.class).getMemTrackerURL()).clearClasses());
+                HtmlStringBuilder html = HtmlStringBuilder.of(LinkBuilder.simpleLink(count + " DB connection" + (count == 1 ? "" : "s") + " in use.", PageFlowUtil.urlProvider(AdminUrls.class).getMemTrackerURL()));
                 html.append(" " + leakCount + " probable leak" + (leakCount == 1 ? "" : "s") + ".");
                 warnings.add(html);
             }
@@ -399,7 +399,7 @@ private void getDeprecatedFeatureWarnings(Warnings warnings, boolean showAllWarn
     private void addStandardWarning(Warnings warnings, String prefix, String linkText, ActionURL url)
     {
         HtmlStringBuilder html = HtmlStringBuilder.of(prefix + " ");
-        html.append(new LinkBuilder(linkText).href(url).clearClasses());
+        html.append(LinkBuilder.simpleLink(linkText, url));
         html.append(".");
         warnings.add(html);
     }
diff --git a/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java b/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java
index e49ee347ab2..8b0aa71dab1 100644
--- a/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java
+++ b/core/src/org/labkey/core/view/template/bootstrap/ViewServiceImpl.java
@@ -18,7 +18,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.settings.AppProps;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.NavTree;
@@ -542,7 +542,7 @@ else if (!config._isWebpart)
                         if (StringUtils.isNotEmpty(link.getHref()) || null != link.getScript())
                         {
                             // Display this NavTree as a simple link. Delegate to LinkBuilder to avoid replicating all its rendering code.
-                            final Link.LinkBuilder lb = link.toSimpleLinkBuilder();
+                            final LinkBuilder lb = link.toSimpleLinkBuilder();
                             lb.clearClasses();
 
                             out.println(lb);
diff --git a/core/src/org/labkey/core/view/template/bootstrap/header.jsp b/core/src/org/labkey/core/view/template/bootstrap/header.jsp
index f95d4c83740..341ac53ced9 100644
--- a/core/src/org/labkey/core/view/template/bootstrap/header.jsp
+++ b/core/src/org/labkey/core/view/template/bootstrap/header.jsp
@@ -278,7 +278,7 @@
         ActionURL stopUrl = urlProvider(LoginUrls.class).getStopImpersonatingURL(c, user.getImpersonationContext().getReturnUrl());
 %>
             <li>
-                <%=link("Stop impersonating").href(stopUrl).clearClasses().addClass("btn btn-primary").usePost()%>
+                <%=simpleLink("Stop impersonating", stopUrl).addClass("btn btn-primary").usePost()%>
             </li>
 <%
     }
@@ -289,7 +289,7 @@
 %>
             <li>&nbsp;</li> <!--spacer, for the case of both impersonating and page admin mode-->
             <li>
-                <%=link("Exit Admin Mode").href(exitUrl).clearClasses().addClass("btn btn-primary").usePost()%>
+                <%=simpleLink("Exit Admin Mode", exitUrl).addClass("btn btn-primary").usePost()%>
             </li>
 <%
     }
diff --git a/devtools/src/org/labkey/devtools/ActionListView.java b/devtools/src/org/labkey/devtools/ActionListView.java
index 96f748d9780..d814ba151f1 100644
--- a/devtools/src/org/labkey/devtools/ActionListView.java
+++ b/devtools/src/org/labkey/devtools/ActionListView.java
@@ -4,6 +4,7 @@
 import org.labkey.api.action.SpringActionController;
 import org.labkey.api.action.SpringActionController.ActionDescriptor;
 import org.labkey.api.data.Container;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
@@ -30,10 +31,10 @@ protected void renderInternal(Object model, PrintWriter out)
 
         _controller.getActionResolver().getActionDescriptors().stream()
             .filter(ad->!(FormHandlerAction.class.isAssignableFrom(ad.getActionClass())))
-            .filter(_filter::test)
+            .filter(_filter)
             .sorted(Comparator.comparing(ActionDescriptor::getPrimaryName))
             .forEach(ad->{
-                out.println(PageFlowUtil.link(ad.getPrimaryName()).href(new ActionURL(ad.getActionClass(), c)).clearClasses());
+                out.println(LinkBuilder.simpleLink(ad.getPrimaryName(), new ActionURL(ad.getActionClass(), c)));
                 out.print("<br>");
             });
     }
diff --git a/devtools/src/org/labkey/devtools/TestController.java b/devtools/src/org/labkey/devtools/TestController.java
index e9a5e209aec..1fd761094db 100644
--- a/devtools/src/org/labkey/devtools/TestController.java
+++ b/devtools/src/org/labkey/devtools/TestController.java
@@ -38,7 +38,7 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.settings.AppProps;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ConfigurationException;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.ExceptionUtil;
@@ -925,7 +925,7 @@ public ModelAndView getView(ButtonForm form, BindException errors)
         {
             if (isPost())
             {
-                Button.ButtonBuilder button = PageFlowUtil.button(form.getText())
+                ButtonBuilder button = PageFlowUtil.button(form.getText())
                     .href(form.getHref())
                     .enabled(form.isEnabled())
                     .disableOnClick(form.isDisableonclick())
@@ -974,15 +974,15 @@ public static class ButtonForm
         private boolean _disableonclick;
         private boolean _enabled;
         private boolean _buttonsubmit;
-        private Button.ButtonBuilder builtButton;
+        private ButtonBuilder builtButton;
 
 
-        public Button.ButtonBuilder getBuiltButton()
+        public ButtonBuilder getBuiltButton()
         {
             return builtButton;
         }
 
-        public void setBuiltButton(Button.ButtonBuilder builtButton)
+        public void setBuiltButton(ButtonBuilder builtButton)
         {
             this.builtButton = builtButton;
         }
diff --git a/devtools/src/org/labkey/devtools/ToolsController.java b/devtools/src/org/labkey/devtools/ToolsController.java
index 474043364d4..3ac084ac5bc 100644
--- a/devtools/src/org/labkey/devtools/ToolsController.java
+++ b/devtools/src/org/labkey/devtools/ToolsController.java
@@ -14,7 +14,7 @@
 import org.labkey.api.security.RequiresPermission;
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.util.BaseScanner.Handler;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.PageFlowUtil;
@@ -135,7 +135,7 @@ public void handle(Path gaPath, Stream<String> stream)
                         {
                             out.println();
                             out.println(
-                                new Button.ButtonBuilder("Delete All " + missing.size() + " File Paths from .gitattributes")
+                                new ButtonBuilder("Delete All " + missing.size() + " File Paths from .gitattributes")
                                     .href(new ActionURL(DeleteMissingFilesAction.class, getContainer()).addParameter("module", _moduleName))
                                     .usePost()
                             );
diff --git a/devtools/src/org/labkey/devtools/view/buttons.jsp b/devtools/src/org/labkey/devtools/view/buttons.jsp
index 75a545136a2..49425317263 100644
--- a/devtools/src/org/labkey/devtools/view/buttons.jsp
+++ b/devtools/src/org/labkey/devtools/view/buttons.jsp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.util.Button" %>
+<%@ page import="org.labkey.api.util.ButtonBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -72,7 +72,7 @@
     <%= button("Generate Button").submit(true) %>
 </labkey:form>
 <%
-    Button.ButtonBuilder button = form.getBuiltButton();
+    ButtonBuilder button = form.getBuiltButton();
     if (button != null)
     {
 %>
diff --git a/experiment/src/org/labkey/experiment/ExperimentRunDisplayColumn.java b/experiment/src/org/labkey/experiment/ExperimentRunDisplayColumn.java
index c83554283d2..da394ec839b 100644
--- a/experiment/src/org/labkey/experiment/ExperimentRunDisplayColumn.java
+++ b/experiment/src/org/labkey/experiment/ExperimentRunDisplayColumn.java
@@ -18,7 +18,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.data.SimpleDisplayColumn;
 import org.labkey.api.exp.api.ExpRun;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.experiment.controllers.exp.ExperimentController;
@@ -49,7 +49,7 @@ public void renderDetailsCellContents(RenderContext ctx, HtmlWriter out)
         {
             ActionURL url = ExperimentController.getRunGraphURL(ctx.getContainer(), _run.getRowId());
 
-            out.write(new LinkBuilder(_run.getName()).href(url).clearClasses());
+            out.write(LinkBuilder.simpleLink(_run.getName(), url));
         }
     }
 }
diff --git a/experiment/src/org/labkey/experiment/LineageGraphDisplayColumn.java b/experiment/src/org/labkey/experiment/LineageGraphDisplayColumn.java
index a3e7f30fb0f..56e0f1eca6d 100644
--- a/experiment/src/org/labkey/experiment/LineageGraphDisplayColumn.java
+++ b/experiment/src/org/labkey/experiment/LineageGraphDisplayColumn.java
@@ -22,7 +22,7 @@
 import org.labkey.api.exp.api.ExpObject;
 import org.labkey.api.exp.api.ExpProtocolApplication;
 import org.labkey.api.exp.api.ExpRun;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.experiment.controllers.exp.ExperimentController;
@@ -71,7 +71,7 @@ public void renderDetailsCellContents(RenderContext ctx, HtmlWriter out)
             url.addParameter("detail", "true");
             url.addParameter("focus", _focus);
 
-            out.write(new LinkBuilder(_linkText).href(url).clearClasses());
+            out.write(LinkBuilder.simpleLink(_linkText, url));
         }
     }
 }
diff --git a/experiment/src/org/labkey/experiment/ProtocolApplicationDisplayColumn.java b/experiment/src/org/labkey/experiment/ProtocolApplicationDisplayColumn.java
index d3ef28dfa23..19885dd3838 100644
--- a/experiment/src/org/labkey/experiment/ProtocolApplicationDisplayColumn.java
+++ b/experiment/src/org/labkey/experiment/ProtocolApplicationDisplayColumn.java
@@ -18,7 +18,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.data.SimpleDisplayColumn;
 import org.labkey.api.exp.api.ExpProtocolApplication;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.experiment.controllers.exp.ExperimentController;
@@ -48,7 +48,7 @@ public void renderDetailsCellContents(RenderContext ctx, HtmlWriter out)
         else
         {
             ActionURL url = ExperimentController.getShowApplicationURL(ctx.getContainer(), _protocolApplication.getRowId());
-            out.write(new LinkBuilder(_protocolApplication.getName()).href(url).clearClasses());
+            out.write(LinkBuilder.simpleLink(_protocolApplication.getName(), url));
         }
     }
 }
diff --git a/experiment/src/org/labkey/experiment/ProtocolDisplayColumn.java b/experiment/src/org/labkey/experiment/ProtocolDisplayColumn.java
index 456cfa4b503..85547657756 100644
--- a/experiment/src/org/labkey/experiment/ProtocolDisplayColumn.java
+++ b/experiment/src/org/labkey/experiment/ProtocolDisplayColumn.java
@@ -18,7 +18,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.data.SimpleDisplayColumn;
 import org.labkey.api.exp.api.ExpProtocol;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.experiment.controllers.exp.ExperimentController;
@@ -50,7 +50,7 @@ public void renderDetailsCellContents(RenderContext ctx, HtmlWriter out)
             ActionURL url = new ActionURL(ExperimentController.ProtocolDetailsAction.class, ctx.getContainer());
             url.addParameter("rowId", Integer.toString(_protocol.getRowId()));
 
-            out.write(new LinkBuilder(_protocol.getName()).href(url).clearClasses());
+            out.write(LinkBuilder.simpleLink(_protocol.getName(), url));
         }
     }
 }
diff --git a/experiment/src/org/labkey/experiment/SampleTypeDisplayColumn.java b/experiment/src/org/labkey/experiment/SampleTypeDisplayColumn.java
index 2ee12c8e77a..cdac9bc4b8e 100644
--- a/experiment/src/org/labkey/experiment/SampleTypeDisplayColumn.java
+++ b/experiment/src/org/labkey/experiment/SampleTypeDisplayColumn.java
@@ -20,7 +20,7 @@
 import org.labkey.api.data.SimpleDisplayColumn;
 import org.labkey.api.exp.api.ExpMaterial;
 import org.labkey.api.exp.api.ExpSampleType;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.experiment.controllers.exp.ExperimentController;
@@ -48,7 +48,7 @@ public void renderDetailsCellContents(RenderContext ctx, HtmlWriter out)
         {
             ActionURL url = new ActionURL(ExperimentController.ShowSampleTypeAction.class, st.getContainer());
             url.addParameter("rowId", Integer.toString(st.getRowId()));
-            out.write(new LinkBuilder(st.getName()).href(url).clearClasses());
+            out.write(LinkBuilder.simpleLink(st.getName(), url));
         }
     }
 }
diff --git a/experiment/src/org/labkey/experiment/api/ExpDataImpl.java b/experiment/src/org/labkey/experiment/api/ExpDataImpl.java
index c1f1973b3df..dc632162010 100644
--- a/experiment/src/org/labkey/experiment/api/ExpDataImpl.java
+++ b/experiment/src/org/labkey/experiment/api/ExpDataImpl.java
@@ -71,13 +71,13 @@
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.util.FileUtil;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.MimeMap;
 import org.labkey.api.util.NetworkDrive;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.Path;
 import org.labkey.api.util.URLHelper;
-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.NavTree;
@@ -1070,7 +1070,7 @@ private void appendParam(StringBuilder sb, @Nullable String dataclass, @Nullable
                 if (addParam)
                     url = url.clone().addParameter(PROPERTY, dataclass);
 
-                sb.append(new LinkBuilder(label).href(url).clearClasses());
+                sb.append(LinkBuilder.simpleLink(label, url));
             }
             else
             {
@@ -1086,7 +1086,7 @@ public HtmlString getHiddenInputsHtml(ViewContext ctx)
             String dataclass = ctx.getActionURL().getParameter(PROPERTY);
             if (dataclass != null)
             {
-                return new InputBuilder<>().type("hidden").id("search-type").name(PROPERTY).value(dataclass).getHtmlString();
+                return InputBuilder.hidden().id("search-type").name(PROPERTY).value(dataclass).getHtmlString();
             }
 
             return null;
diff --git a/experiment/src/org/labkey/experiment/api/ExpFilesTableImpl.java b/experiment/src/org/labkey/experiment/api/ExpFilesTableImpl.java
index 87acc302daf..a9a435bb8e3 100644
--- a/experiment/src/org/labkey/experiment/api/ExpFilesTableImpl.java
+++ b/experiment/src/org/labkey/experiment/api/ExpFilesTableImpl.java
@@ -37,7 +37,7 @@
 import org.labkey.api.security.UserPrincipal;
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.Permission;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.experiment.controllers.exp.ExperimentController;
@@ -161,7 +161,7 @@ protected void renderData(Writer out, ExpData data) throws IOException
             @Override
             public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
             {
-                out.write(new Input.InputBuilder<>().type("text").className("form-control").name("quf_AbsoluteFilePath").size(40));
+                out.write(InputBuilder.text().className("form-control").name("quf_AbsoluteFilePath").size(40));
             }
 
             @Override
diff --git a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java
index 16bdb5e0ea9..5460bd8d2cb 100644
--- a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java
+++ b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java
@@ -215,7 +215,7 @@
 import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.ImageUtil;
 import org.labkey.api.util.JSoupUtil;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.NetworkDrive;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
@@ -225,7 +225,7 @@
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.UniqueID;
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.BadRequestException;
 import org.labkey.api.view.DataView;
@@ -1402,9 +1402,7 @@ else if (_dataClass.getContainer().hasPermission(getUser(), DesignDataClassPermi
             if (!inDefinitionContainer)
             {
                 ActionURL definitionURL = urlProvider(ExperimentUrls.class).getShowDataClassURL(_dataClass.getContainer(), _dataClass.getRowId());
-                Link.LinkBuilder link = PageFlowUtil.link(_dataClass.getContainer().getPath())
-                        .href(definitionURL)
-                        .clearClasses();
+                LinkBuilder link = LinkBuilder.simpleLink(_dataClass.getContainer().getPath(), definitionURL);
                 SimpleDisplayColumn definedInCol = new SimpleDisplayColumn(link.toString());
                 definedInCol.setCaption("Defined In");
                 detailsView.getDataRegion().addDisplayColumn(definedInCol);
diff --git a/experiment/src/org/labkey/experiment/types/types.jsp b/experiment/src/org/labkey/experiment/types/types.jsp
index ab054157180..2193fbd3ddd 100644
--- a/experiment/src/org/labkey/experiment/types/types.jsp
+++ b/experiment/src/org/labkey/experiment/types/types.jsp
@@ -35,7 +35,7 @@
 <table>
     <% for (Domain type : bean.locals.values()) { %>
 <tr>
-    <td><%=link(type.getName(), new ActionURL(TypesController.TypeDetailsAction.class, getContainer()).addParameter("type", type.getTypeURI())).clearClasses()%></td>
+    <td><%=simpleLink(type.getName(), new ActionURL(TypesController.TypeDetailsAction.class, getContainer()).addParameter("type", type.getTypeURI()))%></td>
     <%
         DomainKind kind = type.getDomainKind();
         if (kind != null)
@@ -57,7 +57,7 @@
 <table>
     <% for (Domain type : bean.project.values()) { %>
     <tr>
-        <td><%=link(type.getName(), new ActionURL(TypesController.TypeDetailsAction.class, type.getContainer()).addParameter("type", type.getTypeURI())).clearClasses()%></td>
+        <td><%=simpleLink(type.getName(), new ActionURL(TypesController.TypeDetailsAction.class, type.getContainer()).addParameter("type", type.getTypeURI()))%></td>
         <%
             DomainKind kind = type.getDomainKind();
             if (kind != null)
@@ -79,7 +79,7 @@
 <table>
     <% for (Domain type : bean.globals.values()) { %>
     <tr>
-        <td><%=link(type.getName(), new ActionURL(TypesController.TypeDetailsAction.class, type.getContainer()).addParameter("type", type.getTypeURI())).clearClasses()%></td>
+        <td><%=simpleLink(type.getName(), new ActionURL(TypesController.TypeDetailsAction.class, type.getContainer()).addParameter("type", type.getTypeURI()))%></td>
         <%
             DomainKind kind = type.getDomainKind();
             if (kind != null)
diff --git a/issues/src/org/labkey/issue/IssuesController.java b/issues/src/org/labkey/issue/IssuesController.java
index 1e74c2eae6c..c52a5f2fde3 100644
--- a/issues/src/org/labkey/issue/IssuesController.java
+++ b/issues/src/org/labkey/issue/IssuesController.java
@@ -104,7 +104,7 @@
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.security.roles.OwnerRole;
 import org.labkey.api.security.roles.RoleManager;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.CSRFUtil;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.GUID;
@@ -113,7 +113,7 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;
-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.HtmlView;
 import org.labkey.api.view.HttpView;
@@ -685,7 +685,7 @@ public static DOM.Renderable getUndefinedIssueListMessage(ContainerUser context,
                         String.format("'%s' not specified.", IssuesListView.ISSUE_LIST_DEF_NAME)) :
                 String.format("There is no issues list '%s' defined in this folder.", issueDefName);
         boolean userHasAdmin = context.getContainer().hasPermission(context.getUser(), AdminPermission.class);
-        Button button = PageFlowUtil.button(userHasAdmin ? "Manage Issue List Definitions" : "Show Available Issue Lists").href(QueryService.get().urlFor(context.getUser(),
+        ButtonBuilder.Button button = PageFlowUtil.button(userHasAdmin ? "Manage Issue List Definitions" : "Show Available Issue Lists").href(QueryService.get().urlFor(context.getUser(),
                 context.getContainer(),
                 QueryAction.executeQuery,
                 "issues",
@@ -1988,7 +1988,7 @@ public HtmlString getHiddenInputsHtml(ViewContext ctx)
             String status = ctx.getActionURL().getParameter("status");
             if (status != null)
             {
-                return new InputBuilder<>().type("hidden").id("search-type").name("status").value(status).getHtmlString();
+                return InputBuilder.hidden().id("search-type").name("status").value(status).getHtmlString();
             }
 
             return null;
diff --git a/issues/src/org/labkey/issue/model/IssuePage.java b/issues/src/org/labkey/issue/model/IssuePage.java
index 5825ebc6beb..f34502fb431 100644
--- a/issues/src/org/labkey/issue/model/IssuePage.java
+++ b/issues/src/org/labkey/issue/model/IssuePage.java
@@ -52,10 +52,10 @@
 import org.labkey.api.util.DateUtil;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Input;
+import org.labkey.api.util.InputBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.writer.HtmlWriter;
@@ -525,12 +525,12 @@ public HtmlString writeInput(String field, String value, int tabIndex)
         return writeInput(field, value, builder->builder.tabIndex(tabIndex));
     }
 
-    public HtmlString writeInput(String field, String value, Consumer<Input.InputBuilder<?>> builderModifier)
+    public HtmlString writeInput(String field, String value, Consumer<InputBuilder<?>> builderModifier)
     {
         if (!isVisible(field))
             return HtmlString.unsafe(filter(value, false, true));
 
-        Input.InputBuilder<?> builder = new Input.InputBuilder<>()
+        InputBuilder<?> builder = InputBuilder.text()
             .name(field)
             .value(value)
             .onChange("LABKEY.setDirty(true);return true;")
diff --git a/issues/src/org/labkey/issue/query/IssuesListDefTable.java b/issues/src/org/labkey/issue/query/IssuesListDefTable.java
index c7bc870a484..8609645f556 100644
--- a/issues/src/org/labkey/issue/query/IssuesListDefTable.java
+++ b/issues/src/org/labkey/issue/query/IssuesListDefTable.java
@@ -50,10 +50,10 @@
 import org.labkey.api.security.permissions.InsertPermission;
 import org.labkey.api.security.permissions.Permission;
 import org.labkey.api.security.permissions.ReadPermission;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.issue.IssuesController;
@@ -191,7 +191,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                         {
                             if (c.hasPermission(getUserSchema().getUser(), ReadPermission.class))
                             {
-                                out.write(new Link.LinkBuilder(c.getName()).href(c.getStartURL(getUserSchema().getUser())).clearClasses());
+                                out.write(LinkBuilder.simpleLink(c.getName(), c.getStartURL(getUserSchema().getUser())));
                             }
                             else
                             {
diff --git a/issues/src/org/labkey/issue/query/IssuesTable.java b/issues/src/org/labkey/issue/query/IssuesTable.java
index 5feba3179a2..78f5be7cb6c 100644
--- a/issues/src/org/labkey/issue/query/IssuesTable.java
+++ b/issues/src/org/labkey/issue/query/IssuesTable.java
@@ -67,7 +67,7 @@
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.util.ContainerContext;
-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;
@@ -928,7 +928,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
                         }
                     }
 
-                    Link.LinkBuilder link = new Link.LinkBuilder(linkText)
+                    LinkBuilder link = new LinkBuilder(linkText)
                             .href(url)
                             .title(title)
                             .clearClasses()
diff --git a/list/src/org/labkey/list/model/ListManagerSchema.java b/list/src/org/labkey/list/model/ListManagerSchema.java
index 7e5dc3c07e5..b7022c2b009 100644
--- a/list/src/org/labkey/list/model/ListManagerSchema.java
+++ b/list/src/org/labkey/list/model/ListManagerSchema.java
@@ -38,7 +38,7 @@
 import org.labkey.api.query.QueryView;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
-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.DataView;
@@ -47,16 +47,11 @@
 import org.labkey.list.controllers.ListController;
 import org.springframework.validation.BindException;
 
-import java.io.IOException;
-import java.io.Writer;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-/**
- * Created by joec on 8/18/2014.
- */
 public class ListManagerSchema extends UserSchema
 {
     private static final Set<String> TABLE_NAMES;
@@ -153,11 +148,11 @@ private ActionButton createCreateNewListButton()
                     return btnCreate;
                 }
 
-                private Button createImportListArchiveButton()
+                private ButtonBuilder.Button createImportListArchiveButton()
                 {
                     ActionURL urlImport = new ActionURL(ListController.ImportListArchiveAction.class, getContainer());
                     urlImport.addReturnUrl(getReturnUrl());
-                    Button btnImport = new Button.ButtonBuilder("Import List Archive")
+                    ButtonBuilder.Button btnImport = new ButtonBuilder("Import List Archive")
                             .href(urlImport)
                             .build();
                     btnImport.setDisplayPermission(DesignListPermission.class);
diff --git a/list/src/org/labkey/list/view/deleteListDefinition.jsp b/list/src/org/labkey/list/view/deleteListDefinition.jsp
index cc354d81dd2..107ead77d3b 100644
--- a/list/src/org/labkey/list/view/deleteListDefinition.jsp
+++ b/list/src/org/labkey/list/view/deleteListDefinition.jsp
@@ -50,7 +50,7 @@
     <ul>
         <% for (var listDef : entry.getValue()) { %>
         <li>
-            <%= link(listDef.getName(), listDef.urlFor(ListController.GridAction.class, listDef.getContainer())).clearClasses() %>
+            <%= simpleLink(listDef.getName(), listDef.urlFor(ListController.GridAction.class, listDef.getContainer())) %>
         </li>
         <% } %>
     </ul>
diff --git a/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java b/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java
index 80f9c1a26b4..9b92f389f90 100644
--- a/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java
+++ b/mothership/src/org/labkey/mothership/AssignedToDisplayColumn.java
@@ -21,8 +21,8 @@
 import org.labkey.api.data.DataColumn;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.security.User;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.util.List;
diff --git a/mothership/src/org/labkey/mothership/MothershipController.java b/mothership/src/org/labkey/mothership/MothershipController.java
index 994dfe578a8..b9b90327f15 100644
--- a/mothership/src/org/labkey/mothership/MothershipController.java
+++ b/mothership/src/org/labkey/mothership/MothershipController.java
@@ -67,7 +67,7 @@
 import org.labkey.api.security.permissions.AdminPermission;
 import org.labkey.api.security.permissions.ReadPermission;
 import org.labkey.api.security.permissions.UpdatePermission;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ConfigurationException;
 import org.labkey.api.util.DateUtil;
 import org.labkey.api.util.GUID;
@@ -843,7 +843,7 @@ public ModelAndView getView(ManualImportForm manualImportForm, boolean reshow, B
                             FORM(at(method, "POST"),
                                 TEXTAREA(at(name, "json", rows, "20", cols, "80"), manualImportForm.getJson()),
                                 BR(),
-                                new Button.ButtonBuilder("Save").submit(true).build()
+                                new ButtonBuilder("Save").submit(true).build()
                             ))
                     );
         }
diff --git a/pipeline/src/org/labkey/pipeline/analysis/protocolDetail.jsp b/pipeline/src/org/labkey/pipeline/analysis/protocolDetail.jsp
index 7d3ba14b512..4b1e03a38cd 100644
--- a/pipeline/src/org/labkey/pipeline/analysis/protocolDetail.jsp
+++ b/pipeline/src/org/labkey/pipeline/analysis/protocolDetail.jsp
@@ -17,7 +17,7 @@
 %>
 <%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page import="org.labkey.api.security.permissions.DeletePermission" %>
-<%@ page import="org.labkey.api.util.Button" %>
+<%@ page import="org.labkey.api.util.ButtonBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
@@ -32,7 +32,7 @@
         dependencies.add("codemirror");
     }
 
-    private Button.ButtonBuilder makeButton(AnalysisController.ProtocolTask action, ActionURL urlBase)
+    private ButtonBuilder makeButton(AnalysisController.ProtocolTask action, ActionURL urlBase)
     {
         String actionStr = action.toString();
         String confirmMsg = "Are you sure you want to " + actionStr + " this protocol?";
@@ -43,7 +43,7 @@
 <%
     AnalysisController.ProtocolDetailsForm form = ((HttpView<AnalysisController.ProtocolDetailsForm>) HttpView.currentView()).getModelBean();
     ActionURL returnUrl = form.getReturnActionURL(urlProvider(ProjectUrls.class).getBeginURL(getContainer()));
-    Button.ButtonBuilder cancelButton = button("Cancel").href(returnUrl);
+    ButtonBuilder cancelButton = button("Cancel").href(returnUrl);
 %>
 
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
diff --git a/pipeline/src/org/labkey/pipeline/permission.jsp b/pipeline/src/org/labkey/pipeline/permission.jsp
index d7152f0bf35..103ae76bb8b 100644
--- a/pipeline/src/org/labkey/pipeline/permission.jsp
+++ b/pipeline/src/org/labkey/pipeline/permission.jsp
@@ -30,8 +30,8 @@
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.Pair" %>
 <%@ page import="org.labkey.api.util.SafeToRender" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
-<%@ page import="org.labkey.api.util.element.Select.SelectBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.pipeline.PipelineController.PermissionView" %>
diff --git a/pipeline/src/org/labkey/pipeline/status/StatusDataRegion.java b/pipeline/src/org/labkey/pipeline/status/StatusDataRegion.java
index 1e598db6e16..458cbd6c055 100644
--- a/pipeline/src/org/labkey/pipeline/status/StatusDataRegion.java
+++ b/pipeline/src/org/labkey/pipeline/status/StatusDataRegion.java
@@ -26,7 +26,7 @@
 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.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
@@ -63,7 +63,7 @@ private void renderTab(HtmlWriter out, String text, ActionURL url, boolean selec
             cl(selected, "labkey-frame"),
             HtmlString.NBSP,
             HtmlString.NBSP,
-            new Link.LinkBuilder(text).href(url).clearClasses(),
+            LinkBuilder.simpleLink(text, url),
             HtmlString.NBSP,
             HtmlString.NBSP
         ).appendTo(out);
diff --git a/query/src/org/labkey/query/controllers/QueryController.java b/query/src/org/labkey/query/controllers/QueryController.java
index 3e331bc68b1..5f12965c95c 100644
--- a/query/src/org/labkey/query/controllers/QueryController.java
+++ b/query/src/org/labkey/query/controllers/QueryController.java
@@ -117,14 +117,14 @@
 import org.labkey.api.settings.LookAndFeelProperties;
 import org.labkey.api.stats.BaseAggregatesAnalyticsProvider;
 import org.labkey.api.stats.ColumnAnalyticsProvider;
-import org.labkey.api.util.Button.ButtonBuilder;
+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.JavaScriptFragment;
 import org.labkey.api.util.JsonUtil;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.ResponseHelper;
@@ -714,16 +714,15 @@ private Renderable getDataSourcePath(String path, Collection<ExternalSchemaDef>
                 TD(TABLE(
                     TR(TD(
                         at(DOM.Attribute.colspan, 3),
-                        hasRead ? new LinkBuilder(path).href(urls.urlExternalSchemaAdmin(c)).clearClasses() : path
+                        hasRead ? LinkBuilder.simpleLink(path, urls.urlExternalSchemaAdmin(c)) : path
                     )),
                     TR(TD(TABLE(
                         defs.stream()
                             .map(def -> TR(TD(
                                 at(DOM.Attribute.style, "padding-left:20px"),
-                                hasRead ? new LinkBuilder(def.getUserSchemaName() +
-                                    (!StringUtils.equals(def.getSourceSchemaName(), def.getUserSchemaName()) ? " (" + def.getSourceSchemaName() + ")" : ""))
-                                    .href(urls.urlUpdateExternalSchema(c, def))
-                                    .clearClasses() : def.getUserSchemaName()
+                                hasRead ? LinkBuilder.simpleLink(def.getUserSchemaName() +
+                                    (!StringUtils.equals(def.getSourceSchemaName(), def.getUserSchemaName()) ? " (" + def.getSourceSchemaName() + ")" : ""), urls.urlUpdateExternalSchema(c, def))
+                                    : def.getUserSchemaName()
                             )))
                     )))
                 ));
diff --git a/query/src/org/labkey/query/view/newQuery.jsp b/query/src/org/labkey/query/view/newQuery.jsp
index 9acd54dffdf..6f560320cb2 100644
--- a/query/src/org/labkey/query/view/newQuery.jsp
+++ b/query/src/org/labkey/query/view/newQuery.jsp
@@ -17,7 +17,7 @@
 %>
 <%@ page import="org.labkey.api.query.QueryParam"%>
 <%@ page import="org.labkey.api.query.QueryUrls"%>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.query.controllers.NewQueryForm" %>
 <%@ page import="org.labkey.query.controllers.QueryController" %>
diff --git a/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java b/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java
index 638d46cb849..cc3becb4a78 100644
--- a/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java
+++ b/specimen/src/org/labkey/specimen/SpecimenCommentAuditProvider.java
@@ -31,7 +31,7 @@
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.query.UserSchema;
-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.specimen.actions.SpecimenController;
@@ -141,7 +141,7 @@ public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWrit
                                     }
 
                                     ActionURL url = SpecimenController.getCommentURL(container, globalUniqueId);
-                                    oldWriter.write(new Link.LinkBuilder(globalUniqueId).href(url).clearClasses().toString());
+                                    oldWriter.write(LinkBuilder.simpleLink(globalUniqueId, url).toString());
                                 }
                             };
                         }
diff --git a/specimen/src/org/labkey/specimen/actions/ManageRequestBean.java b/specimen/src/org/labkey/specimen/actions/ManageRequestBean.java
index 0732f68750c..759d490733a 100644
--- a/specimen/src/org/labkey/specimen/actions/ManageRequestBean.java
+++ b/specimen/src/org/labkey/specimen/actions/ManageRequestBean.java
@@ -7,7 +7,7 @@
 import org.labkey.api.specimen.location.LocationImpl;
 import org.labkey.api.specimen.location.LocationManager;
 import org.labkey.api.study.Location;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DisplayElement;
 import org.labkey.api.view.ViewContext;
@@ -83,7 +83,7 @@ public ManageRequestBean(ViewContext context, SpecimenRequest specimenRequest, b
 
                 ActionURL importActionURL = new ActionURL(ImportVialIdsAction.class, _container);
                 importActionURL.addParameter("id", specimenRequest.getRowId());
-                Button importButton = new Button.ButtonBuilder("Upload Specimen Ids")
+                ButtonBuilder.Button importButton = new ButtonBuilder("Upload Specimen Ids")
                         .href(importActionURL)
                         .submit(false)
                         .build();
diff --git a/specimen/src/org/labkey/specimen/actions/SpecimenController.java b/specimen/src/org/labkey/specimen/actions/SpecimenController.java
index 255e6bc66ac..94674b80544 100644
--- a/specimen/src/org/labkey/specimen/actions/SpecimenController.java
+++ b/specimen/src/org/labkey/specimen/actions/SpecimenController.java
@@ -109,19 +109,19 @@
 import org.labkey.api.study.model.CohortService;
 import org.labkey.api.study.model.ParticipantDataset;
 import org.labkey.api.study.security.permissions.ManageStudyPermission;
-import org.labkey.api.util.Button;
+import org.labkey.api.util.ButtonBuilder;
 import org.labkey.api.util.ConfigurationException;
 import org.labkey.api.util.DateUtil;
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.FileStream;
 import org.labkey.api.util.GUID;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.MailHelper;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.util.emailTemplate.EmailTemplateService;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.AjaxCompletion;
@@ -532,7 +532,7 @@ public SpecimenQueryView getSpecimenQueryView(boolean showVials, boolean forExpo
 
         if (getViewContext().hasPermission(AdminPermission.class))
         {
-            Button upload = new Button.ButtonBuilder("Import Specimens")
+            ButtonBuilder.Button upload = new ButtonBuilder("Import Specimens")
                 .href(new ActionURL(ShowUploadSpecimensAction.class, getContainer()))
                 .build();
             buttons.add(upload);
@@ -562,7 +562,7 @@ public void render(RenderContext ctx, Writer out) throws IOException
             int locationId = null == StringUtils.trimToNull(excludeStr) ? 0 : Integer.parseInt(excludeStr);
             List<LocationImpl> locations = LocationManager.get().getValidRequestingLocations(ctx.getContainer());
 
-            new Select.SelectBuilder()
+            new SelectBuilder()
                 .addOption("<Show All>", "")
                 .addOptions(locations.stream().map(location -> new OptionBuilder(location.getDisplayName(), location.getRowId())))
                 .selected(locationId)
@@ -4387,7 +4387,7 @@ public class RequestHistoryAction extends SimpleViewAction<IdForm>
         public ModelAndView getView(IdForm form, BindException errors)
         {
             _requestId = form.getId();
-            HtmlView header = new HtmlView(new Link.LinkBuilder("View Request").href(SpecimenController.getManageRequestURL(getContainer(), form.getId(), null)));
+            HtmlView header = new HtmlView(new LinkBuilder("View Request").href(SpecimenController.getManageRequestURL(getContainer(), form.getId(), null)));
             SimpleFilter filter = new SimpleFilter(FieldKey.fromParts("RequestId"), form.getId());
             GridView historyGrid = getRequestEventGridView(getViewContext().getRequest(), errors, filter);
             return new VBox(header, historyGrid);
diff --git a/specimen/src/org/labkey/specimen/query/SpecimenQueryView.java b/specimen/src/org/labkey/specimen/query/SpecimenQueryView.java
index 9adbd10c088..93b3e6f1d51 100644
--- a/specimen/src/org/labkey/specimen/query/SpecimenQueryView.java
+++ b/specimen/src/org/labkey/specimen/query/SpecimenQueryView.java
@@ -59,6 +59,7 @@
 import org.labkey.api.study.model.ParticipantDataset;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.HtmlStringBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DataView;
@@ -188,7 +189,7 @@ protected void renderExtraRecordSelectorContent(RenderContext ctx, HtmlWriter ou
                 HtmlStringBuilder builder = HtmlStringBuilder.of(reason instanceof String r ? r : "Specimen Unavailable.")
                     .append(HtmlString.BR).append(HtmlString.BR)
                     .append("Click ")
-                    .append(PageFlowUtil.link("[history]", getHistoryLink(ctx)).clearClasses())
+                    .append(LinkBuilder.simpleLink("[history]", getHistoryLink(ctx)))
                     .append(" for more information.");
 
                 out.write(PageFlowUtil.popupHelp(builder.getHtmlString(), "Specimen Unavailable"));
diff --git a/specimen/src/org/labkey/specimen/report/SpecimenVisitReportParameters.java b/specimen/src/org/labkey/specimen/report/SpecimenVisitReportParameters.java
index cd52320230a..fea8b56d845 100644
--- a/specimen/src/org/labkey/specimen/report/SpecimenVisitReportParameters.java
+++ b/specimen/src/org/labkey/specimen/report/SpecimenVisitReportParameters.java
@@ -34,8 +34,8 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.SafeToRenderEnum;
-import org.labkey.api.util.element.Option.OptionBuilder;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.UnauthorizedException;
 import org.labkey.api.view.ViewForm;
@@ -335,7 +335,7 @@ else if (cohortFilter != null)
 
     protected Pair<String, HtmlString> getEnrollmentSitePicker(String inputName, Set<LocationImpl> locations, Integer selectedSiteId)
     {
-        Select.SelectBuilder sb = new Select.SelectBuilder()
+        SelectBuilder sb = new SelectBuilder()
             .name(inputName)
             .addOption(new OptionBuilder()
                 .value("")
@@ -369,7 +369,7 @@ protected Pair<String, HtmlString> getEnrollmentSitePicker(String inputName, Set
 
     public HtmlString getCustomViewPicker(Map<String, CustomView> specimenDetailViews)
     {
-        Select.SelectBuilder sb = new Select.SelectBuilder()
+        SelectBuilder sb = new SelectBuilder()
             .name("baseCustomViewName")
             .addOption(new OptionBuilder()
                 .value("")
@@ -427,7 +427,7 @@ public boolean isAllSubjectsOption(String subject)
     protected Pair<String, HtmlString> getParticipantPicker(String inputName, String selectedParticipantId)
     {
         Study study = StudyService.get().getStudy(getContainer());
-        Select.SelectBuilder builder = new Select.SelectBuilder();
+        SelectBuilder builder = new SelectBuilder();
 
         String allString = getAllString();
         Collection<String> participantIds = StudyService.get().getParticipantIds(study, getUser());
diff --git a/specimen/src/org/labkey/specimen/report/participant/ParticipantTypeReportFactory.java b/specimen/src/org/labkey/specimen/report/participant/ParticipantTypeReportFactory.java
index a854c08a7c9..3ad79ee5026 100644
--- a/specimen/src/org/labkey/specimen/report/participant/ParticipantTypeReportFactory.java
+++ b/specimen/src/org/labkey/specimen/report/participant/ParticipantTypeReportFactory.java
@@ -18,15 +18,15 @@
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.security.User;
-import org.labkey.specimen.model.SpecimenTypeSummary;
 import org.labkey.api.study.StudyService;
 import org.labkey.api.study.Visit;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.OptionBuilder;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.specimen.SpecimenManager;
 import org.labkey.specimen.actions.SpecimenReportActions;
+import org.labkey.specimen.model.SpecimenTypeSummary;
 import org.labkey.specimen.report.SpecimenVisitReport;
 import org.labkey.specimen.report.SpecimenVisitReportAction;
 import org.labkey.specimen.report.SpecimenVisitReportParameters;
@@ -37,10 +37,6 @@
 
 import static org.labkey.api.util.HtmlString.unsafe;
 
-/**
- * User: brittp
- * Created: Jan 30, 2008 3:40:07 PM
- */
 public class ParticipantTypeReportFactory extends SpecimenVisitReportParameters
 {
     private String _selectedType;
@@ -81,7 +77,7 @@ public List<Pair<String, HtmlString>> getAdditionalFormInputHtml(User user)
         return Collections.singletonList(getSpecimenTypePicker());
     }
 
-    private void appendOptions(List<? extends SpecimenTypeSummary.TypeCount> types, Select.SelectBuilder builder, String parentId, String selectedId, int indent)
+    private void appendOptions(List<? extends SpecimenTypeSummary.TypeCount> types, SelectBuilder builder, String parentId, String selectedId, int indent)
     {
         for (SpecimenTypeSummary.TypeCount type : types)
         {
@@ -90,7 +86,7 @@ private void appendOptions(List<? extends SpecimenTypeSummary.TypeCount> types,
             HtmlString encodedLabel = unsafe(spacing + HtmlString.of(label));
 
             String id = parentId != null ? parentId + TYPE_COMPONENT_SEPARATOR + label : label;
-            builder.addOption(new Option.OptionBuilder()
+            builder.addOption(new OptionBuilder()
                     .value(id)
                     .label(encodedLabel)
                     .selected(id.equals(selectedId))
@@ -171,23 +167,23 @@ private SpecimenTypeSummary.TypeCount getTypeCountByLabel(List<? extends Specime
 
     protected Pair<String, HtmlString> getSpecimenTypePicker()
     {
-        Select.SelectBuilder select = new Select.SelectBuilder();
+        SelectBuilder select = new SelectBuilder();
         SpecimenTypeSummary summary = SpecimenManager.get().getSpecimenTypeSummary(getContainer(), getUser());
         select.name("selectedType");
 
-        select.addOption(new Option.OptionBuilder()
+        select.addOption(new OptionBuilder()
             .value(ALL_PRIMARY_TYPES_FORM_VALUE)
             .label("One report per primary type")
             .selected(ALL_PRIMARY_TYPES_FORM_VALUE.equals(_selectedType))
             .build());
 
-        select.addOption(new Option.OptionBuilder()
+        select.addOption(new OptionBuilder()
             .value(ALL_DERIVATIVE_TYPES_FORM_VALUE)
             .label("One report per derivative type")
             .selected(ALL_DERIVATIVE_TYPES_FORM_VALUE.equals(_selectedType))
             .build());
 
-        select.addOption(new Option.OptionBuilder()
+        select.addOption(new OptionBuilder()
             .value(ALL_ADDITIVE_TYPES_FORM_VALUE)
             .label("One report per additive type")
             .selected(ALL_ADDITIVE_TYPES_FORM_VALUE.equals(_selectedType))
diff --git a/specimen/src/org/labkey/specimen/report/request/BaseRequestReportFactory.java b/specimen/src/org/labkey/specimen/report/request/BaseRequestReportFactory.java
index 3bda39727dd..49285411d01 100644
--- a/specimen/src/org/labkey/specimen/report/request/BaseRequestReportFactory.java
+++ b/specimen/src/org/labkey/specimen/report/request/BaseRequestReportFactory.java
@@ -18,8 +18,8 @@
 import org.labkey.api.security.User;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.specimen.report.specimentype.TypeReportFactory;
 
 import java.util.List;
@@ -50,15 +50,15 @@ public List<Pair<String, HtmlString>> getAdditionalFormInputHtml(User user)
     {
         List<Pair<String, HtmlString>> superInputs = super.getAdditionalFormInputHtml(user);
 
-        Select.SelectBuilder sb = new Select.SelectBuilder();
+        SelectBuilder sb = new SelectBuilder();
 
-        sb.addOption(new Option.OptionBuilder()
+        sb.addOption(new OptionBuilder()
             .value(Boolean.toString(false))
             .label("Include in-process requests")
             .build()
         );
 
-        sb.addOption(new Option.OptionBuilder()
+        sb.addOption(new OptionBuilder()
             .value(Boolean.toString(true))
             .label("Completed requests only")
             .selected(_completedRequestsOnly)
diff --git a/specimen/src/org/labkey/specimen/report/request/RequestLocationReportFactory.java b/specimen/src/org/labkey/specimen/report/request/RequestLocationReportFactory.java
index 7a0353883ed..9110aa7bd7f 100644
--- a/specimen/src/org/labkey/specimen/report/request/RequestLocationReportFactory.java
+++ b/specimen/src/org/labkey/specimen/report/request/RequestLocationReportFactory.java
@@ -23,8 +23,8 @@
 import org.labkey.api.study.Visit;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.specimen.SpecimenManager;
 import org.labkey.specimen.actions.SpecimenReportActions;
 import org.labkey.specimen.report.SpecimenVisitReport;
@@ -120,17 +120,17 @@ public Class<? extends SpecimenVisitReportAction> getAction()
     public List<Pair<String, HtmlString>> getAdditionalFormInputHtml(User user)
     {
 
-        Select.SelectBuilder builder = new Select.SelectBuilder();
+        SelectBuilder builder = new SelectBuilder();
 
         builder.name("locationId")
-            .addOption(new Option.OptionBuilder()
+            .addOption(new OptionBuilder()
             .value("")
             .label("All Requesting Locations")
             .build());
 
         for (LocationImpl location : SpecimenManager.get().getSitesWithRequests(getContainer()))
         {
-            builder.addOption(new Option.OptionBuilder()
+            builder.addOption(new OptionBuilder()
                 .value(Integer.toString(location.getRowId()))
                 .label(location.getLabel())
                 .selected(_locationId != null && location.getRowId() == _locationId)
diff --git a/specimen/src/org/labkey/specimen/report/specimentype/TypeCohortReportFactory.java b/specimen/src/org/labkey/specimen/report/specimentype/TypeCohortReportFactory.java
index d3e54beecf5..2d33b91c2b8 100644
--- a/specimen/src/org/labkey/specimen/report/specimentype/TypeCohortReportFactory.java
+++ b/specimen/src/org/labkey/specimen/report/specimentype/TypeCohortReportFactory.java
@@ -26,9 +26,9 @@
 import org.labkey.api.study.model.CohortService;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Input;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.InputBuilder;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.specimen.SpecimenManager;
 import org.labkey.specimen.actions.SpecimenReportActions;
 import org.labkey.specimen.report.SpecimenVisitReport;
@@ -65,17 +65,16 @@ public List<Pair<String, HtmlString>> getAdditionalFormInputHtml(User user)
         if (study.isAdvancedCohorts())
         {
             CohortFilter.Type currentType = getCohortFilter() != null ? getCohortFilter().getType() : CohortFilter.Type.DATA_COLLECTION;
-            Input.InputBuilder<?> input = new Input.InputBuilder<>()
-                .type("hidden")
+            InputBuilder<?> input = InputBuilder.hidden()
                 .value("0")
                 .name(Params.cohortId.name());
 
-            Select.SelectBuilder select = new Select.SelectBuilder()
+            SelectBuilder select = new SelectBuilder()
                 .name(Params.cohortFilterType.name());
 
             for (CohortFilter.Type type : CohortFilter.Type.values())
             {
-                select.addOption(new Option.OptionBuilder()
+                select.addOption(new OptionBuilder()
                     .value(type.name())
                     .label(type.getTitle())
                     .selected(type == currentType)
diff --git a/specimen/src/org/labkey/specimen/report/specimentype/TypeReportFactory.java b/specimen/src/org/labkey/specimen/report/specimentype/TypeReportFactory.java
index 72a789ef138..ac1d53bc699 100644
--- a/specimen/src/org/labkey/specimen/report/specimentype/TypeReportFactory.java
+++ b/specimen/src/org/labkey/specimen/report/specimentype/TypeReportFactory.java
@@ -19,8 +19,8 @@
 import org.labkey.api.study.SpecimenService;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.Pair;
-import org.labkey.api.util.element.Option;
-import org.labkey.api.util.element.Select;
+import org.labkey.api.util.OptionBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.specimen.report.SpecimenTypeLevel;
 import org.labkey.specimen.report.SpecimenVisitReportParameters;
 
@@ -42,12 +42,12 @@ public List<Pair<String, HtmlString>> getAdditionalFormInputHtml(User user)
 
         if (!SpecimenService.get().getRequestCustomizer().omitTypeGroupingsWhenReporting())
         {
-            Select.SelectBuilder builder = new Select.SelectBuilder();
+            SelectBuilder builder = new SelectBuilder();
             builder.name(PARAMS.typeLevel.name());
 
             for (SpecimenTypeLevel level : SpecimenTypeLevel.values())
             {
-                builder.addOption(new Option.OptionBuilder()
+                builder.addOption(new OptionBuilder()
                     .value(level.name())
                     .label("Show results by: " + level.getLabel())
                     .selected(getTypeLevelEnum() == level)
diff --git a/specimen/src/org/labkey/specimen/view/SpecimenRequestNotificationEmailTemplate.java b/specimen/src/org/labkey/specimen/view/SpecimenRequestNotificationEmailTemplate.java
index df3de869c9a..1c91886c1b9 100644
--- a/specimen/src/org/labkey/specimen/view/SpecimenRequestNotificationEmailTemplate.java
+++ b/specimen/src/org/labkey/specimen/view/SpecimenRequestNotificationEmailTemplate.java
@@ -20,7 +20,7 @@
 import org.labkey.api.security.User;
 import org.labkey.api.study.Study;
 import org.labkey.api.study.StudyService;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.emailTemplate.EmailTemplate;
 import org.labkey.specimen.actions.SpecimenController;
@@ -159,7 +159,7 @@ protected void addCustomReplacements(Replacements replacements)
             StringBuilder sb = new StringBuilder();
             for (Attachment att : attachments)
             {
-                sb.append(new LinkBuilder(att.getName()).href(SpecimenController.getDownloadURL(_notification.getEvent(), att.getName())).clearClasses());
+                sb.append(LinkBuilder.simpleLink(att.getName(), SpecimenController.getDownloadURL(_notification.getEvent(), att.getName())));
                 sb.append("<br>");
             }
             return sb.toString();
diff --git a/specimen/src/org/labkey/specimen/view/chooseImporter.jsp b/specimen/src/org/labkey/specimen/view/chooseImporter.jsp
index 3b25f85bbc7..6cc910506b2 100644
--- a/specimen/src/org/labkey/specimen/view/chooseImporter.jsp
+++ b/specimen/src/org/labkey/specimen/view/chooseImporter.jsp
@@ -12,7 +12,7 @@
 <%@ page import="org.labkey.api.study.SpecimenService" %>
 <%@ page import="org.labkey.api.study.SpecimenTransform" %>
 <%@ page import="org.labkey.api.study.StudyUrls" %>
-<%@ page import="org.labkey.api.util.Button" %>
+<%@ page import="org.labkey.api.util.ButtonBuilder" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.URLHelper" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
@@ -103,12 +103,12 @@
 
                 <br/>
 
-                <%=  new Button.ButtonBuilder("Save")
+                <%=  new ButtonBuilder("Save")
                         .submit(true)
                         .build()
                 %>
 
-                <%=  new Button.ButtonBuilder("Cancel")
+                <%=  new ButtonBuilder("Cancel")
                         .href(cancelLink)
                         .build()
                 %>
@@ -131,7 +131,7 @@
 
             <br/><br/>
 
-            <%=  new Button.ButtonBuilder("Done")
+            <%=  new ButtonBuilder("Done")
                         .href(cancelLink)
                         .build()
             %>
diff --git a/specimen/src/org/labkey/specimen/view/requestSpecimens.jsp b/specimen/src/org/labkey/specimen/view/requestSpecimens.jsp
index d575a666d73..335a0217227 100644
--- a/specimen/src/org/labkey/specimen/view/requestSpecimens.jsp
+++ b/specimen/src/org/labkey/specimen/view/requestSpecimens.jsp
@@ -20,7 +20,7 @@
 <%@ page import="org.labkey.api.specimen.location.LocationImpl"%>
 <%@ page import="org.labkey.api.specimen.location.LocationManager"%>
 <%@ page import="org.labkey.api.study.SpecimenService"%>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder"%>
+<%@ page import="org.labkey.api.util.OptionBuilder"%>
 <%@ page import="org.labkey.api.view.ActionURL"%>
 <%@ page import="org.labkey.api.view.HttpView"%>
 <%@ page import="org.labkey.api.view.JspView" %>
diff --git a/study/api-src/org/labkey/api/study/InsertUpdateAction.java b/study/api-src/org/labkey/api/study/InsertUpdateAction.java
index 00554a6f2f9..ff2ef8489c3 100644
--- a/study/api-src/org/labkey/api/study/InsertUpdateAction.java
+++ b/study/api-src/org/labkey/api/study/InsertUpdateAction.java
@@ -52,7 +52,7 @@
 import org.labkey.api.study.model.CohortService;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.URLHelper;
-import org.labkey.api.util.element.Select.SelectBuilder;
+import org.labkey.api.util.SelectBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DataView;
 import org.labkey.api.view.InsertView;
diff --git a/study/src/org/labkey/study/StudyModule.java b/study/src/org/labkey/study/StudyModule.java
index 7569a982867..af55afeabd7 100644
--- a/study/src/org/labkey/study/StudyModule.java
+++ b/study/src/org/labkey/study/StudyModule.java
@@ -26,11 +26,9 @@
 import org.labkey.api.admin.notification.NotificationService;
 import org.labkey.api.attachments.AttachmentService;
 import org.labkey.api.audit.AuditLogService;
-import org.labkey.api.collections.LabKeyCollectors;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.PropertySchema;
-import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.SqlExecutor;
 import org.labkey.api.data.SqlSelector;
 import org.labkey.api.data.TableInfo;
@@ -55,7 +53,6 @@
 import org.labkey.api.qc.DataStateManager;
 import org.labkey.api.qc.export.DataStateImportExportHelper;
 import org.labkey.api.query.DefaultSchema;
-import org.labkey.api.query.FieldKey;
 import org.labkey.api.query.QueryService;
 import org.labkey.api.query.snapshot.QuerySnapshotService;
 import org.labkey.api.reports.ReportContentEmailManager;
@@ -106,11 +103,8 @@
 import org.labkey.api.studydesign.query.StudyTreatmentProductDomainKind;
 import org.labkey.api.usageMetrics.UsageMetricsService;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.JspTestCase;
-import org.labkey.api.util.Link;
 import org.labkey.api.util.PageFlowUtil;
-import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.SystemMaintenance;
 import org.labkey.api.util.UsageReportingLevel;
 import org.labkey.api.view.ActionURL;
@@ -124,9 +118,6 @@
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.view.WebPartFactory;
 import org.labkey.api.view.WebPartView;
-import org.labkey.api.view.template.WarningProvider;
-import org.labkey.api.view.template.WarningService;
-import org.labkey.api.view.template.Warnings;
 import org.labkey.api.wiki.WikiRenderingService;
 import org.labkey.api.writer.ContainerUser;
 import org.labkey.study.assay.ExperimentListenerImpl;
@@ -206,7 +197,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.stream.Collectors;
diff --git a/study/src/org/labkey/study/controllers/StudyController.java b/study/src/org/labkey/study/controllers/StudyController.java
index c577f1b4c0e..242d561b5a3 100644
--- a/study/src/org/labkey/study/controllers/StudyController.java
+++ b/study/src/org/labkey/study/controllers/StudyController.java
@@ -204,7 +204,7 @@
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.XmlBeansUtil;
-import org.labkey.api.util.element.CsrfInput;
+import org.labkey.api.util.CsrfInput;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DataView;
 import org.labkey.api.view.GridView;
diff --git a/study/src/org/labkey/study/query/CohortQueryView.java b/study/src/org/labkey/study/query/CohortQueryView.java
index f3317d735a3..ba06d86c943 100644
--- a/study/src/org/labkey/study/query/CohortQueryView.java
+++ b/study/src/org/labkey/study/query/CohortQueryView.java
@@ -25,7 +25,7 @@
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.security.User;
 import org.labkey.api.security.permissions.AdminPermission;
-import org.labkey.api.util.Link.LinkBuilder;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.DataView;
 import org.labkey.api.view.ViewContext;
diff --git a/study/src/org/labkey/study/query/PublishedRecordQueryView.java b/study/src/org/labkey/study/query/PublishedRecordQueryView.java
index 9d868f5e735..93780824531 100644
--- a/study/src/org/labkey/study/query/PublishedRecordQueryView.java
+++ b/study/src/org/labkey/study/query/PublishedRecordQueryView.java
@@ -30,12 +30,11 @@
 import org.labkey.api.study.Dataset;
 import org.labkey.api.study.publish.StudyPublishService;
 import org.labkey.api.util.HtmlStringBuilder;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.SafeToRender;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.writer.HtmlWriter;
 
-import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 
@@ -117,7 +116,7 @@ private SafeToRender getMissingRowsMessage(String count, ActionURL url)
         {
             return HtmlStringBuilder.of(String.format("%s rows that were previously linked in this event have been recalled (or deleted)." +
                     " The audit record(s) of the deleted rows can be found in the ", count))
-                .append(new Link.LinkBuilder("link to study history view").href(url).clearClasses())
+                .append(LinkBuilder.simpleLink("link to study history view", url))
                 .append(", or the study dataset history view.");
         }
     }
diff --git a/study/src/org/labkey/study/security/datasets.jsp b/study/src/org/labkey/study/security/datasets.jsp
index 60260b12b3a..54d1298eea8 100644
--- a/study/src/org/labkey/study/security/datasets.jsp
+++ b/study/src/org/labkey/study/security/datasets.jsp
@@ -29,7 +29,7 @@
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.HtmlStringBuilder" %>
 <%@ page import="org.labkey.api.util.Pair" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.study.controllers.StudyController.ManageStudyAction" %>
diff --git a/study/src/org/labkey/study/security/studySecurity.jsp b/study/src/org/labkey/study/security/studySecurity.jsp
index 74825f703df..badd7bb3b58 100644
--- a/study/src/org/labkey/study/security/studySecurity.jsp
+++ b/study/src/org/labkey/study/security/studySecurity.jsp
@@ -17,7 +17,7 @@
 %>
 <%@ page import="org.labkey.api.security.SecurityUrls"%>
 <%@ page import="org.labkey.api.study.Study"%>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder"%>
+<%@ page import="org.labkey.api.util.OptionBuilder"%>
 <%@ page import="org.labkey.api.view.HttpView"%>
 <%@ page import="org.labkey.study.controllers.security.SecurityController.StudySecurityAction" %>
 <%@ page import="org.labkey.study.model.SecurityType" %>
diff --git a/study/src/org/labkey/study/view/crosstabDesigner.jsp b/study/src/org/labkey/study/view/crosstabDesigner.jsp
index 6eaeb012890..bc85fcfc0aa 100644
--- a/study/src/org/labkey/study/view/crosstabDesigner.jsp
+++ b/study/src/org/labkey/study/view/crosstabDesigner.jsp
@@ -19,8 +19,8 @@
 <%@ page import="org.labkey.api.query.FieldKey"%>
 <%@ page import="org.labkey.api.study.StudyService"%>
 <%@ page import="org.labkey.api.util.HtmlString"%>
-<%@ page import="org.labkey.api.util.element.Option"%>
-<%@ page import="org.labkey.api.util.element.Select.SelectBuilder"%>
+<%@ page import="org.labkey.api.util.OptionBuilder"%>
+<%@ page import="org.labkey.api.util.SelectBuilder"%>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
@@ -110,7 +110,7 @@
         if (allowBlank)
             builder.addOption("", "");
         if (cols.containsKey("SequenceNum"))
-            builder.addOption(new Option.OptionBuilder("Visit Id", "SequenceNum")
+            builder.addOption(new OptionBuilder("Visit Id", "SequenceNum")
                     .selected("SequenceNum".equalsIgnoreCase(selected)));
 
         String subjectNoun = StudyService.get().getSubjectColumnName(getContainer());
diff --git a/study/src/org/labkey/study/view/customizeParticipantWebPart.jsp b/study/src/org/labkey/study/view/customizeParticipantWebPart.jsp
index 19d0d2be4db..39c51fe2263 100644
--- a/study/src/org/labkey/study/view/customizeParticipantWebPart.jsp
+++ b/study/src/org/labkey/study/view/customizeParticipantWebPart.jsp
@@ -19,7 +19,7 @@
 <%@ page import="org.labkey.api.study.CompletionType" %>
 <%@ page import="org.labkey.api.study.StudyService" %>
 <%@ page import="org.labkey.api.study.StudyUrls" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
diff --git a/study/src/org/labkey/study/view/datasetDetails.jsp b/study/src/org/labkey/study/view/datasetDetails.jsp
index 8a51b6fd86b..f29562aec0a 100644
--- a/study/src/org/labkey/study/view/datasetDetails.jsp
+++ b/study/src/org/labkey/study/view/datasetDetails.jsp
@@ -28,7 +28,7 @@
 <%@ page import="org.labkey.api.study.StudyService" %>
 <%@ page import="org.labkey.api.study.TimepointType" %>
 <%@ page import="org.labkey.api.study.Visit" %>
-<%@ page import="org.labkey.api.util.Button" %>
+<%@ page import="org.labkey.api.util.ButtonBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -100,7 +100,7 @@ if (!shadowed.isEmpty())
     %><%=unsafe(sb.toString())%><br><%
 }
 
-List<Button.ButtonBuilder> buttons = new ArrayList<>();
+List<ButtonBuilder> buttons = new ArrayList<>();
 if (permissions.contains(AdminPermission.class))
 {
     if (dataset.getType().equals(Dataset.TYPE_STANDARD))
@@ -153,7 +153,7 @@ if (permissions.contains(AdminPermission.class) && !isDatasetInherited)
 }
 %><br/>
 <labkey:form method="POST" action=""><%
-for (Button.ButtonBuilder bb : buttons)
+for (ButtonBuilder bb : buttons)
 {
     %><%= bb %> <%
 }
diff --git a/study/src/org/labkey/study/view/datasetVisibility.jsp b/study/src/org/labkey/study/view/datasetVisibility.jsp
index de0952e57f3..74cc733f341 100644
--- a/study/src/org/labkey/study/view/datasetVisibility.jsp
+++ b/study/src/org/labkey/study/view/datasetVisibility.jsp
@@ -18,7 +18,7 @@
 <%@ page import="org.labkey.api.study.Study"%>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.JavaScriptFragment" %>
-<%@ page import="org.labkey.api.util.element.Select.SelectBuilder" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -89,7 +89,7 @@
 <labkey:errors/>
 
 <%
-    if (bean.entrySet().size() == 0)
+    if (bean.entrySet().isEmpty())
     {
         ActionURL createURL = urlFor(DefineDatasetTypeAction.class);
 %>
@@ -136,7 +136,7 @@
             </td>
             <td>
                 <%
-                    if (cohorts == null || cohorts.size() == 0)
+                    if (cohorts == null || cohorts.isEmpty())
                     {
                 %>
                     <em>No cohorts defined</em>
diff --git a/study/src/org/labkey/study/view/datasets.jsp b/study/src/org/labkey/study/view/datasets.jsp
index 31cfcb862b2..ab18e6583d1 100644
--- a/study/src/org/labkey/study/view/datasets.jsp
+++ b/study/src/org/labkey/study/view/datasets.jsp
@@ -21,7 +21,6 @@
 <%@ page import="org.labkey.api.security.permissions.AdminPermission" %>
 <%@ page import="org.labkey.api.security.permissions.ReadPermission" %>
 <%@ page import="org.labkey.api.study.Dataset" %>
-<%@ page import="org.labkey.api.study.Study" %>
 <%@ page import="org.labkey.api.util.DOM" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.study.controllers.StudyController" %>
@@ -118,7 +117,7 @@
             }
 
             String datasetLabel = (dataset.getLabel() != null ? dataset.getLabel() : "" + dataset.getDatasetId());
-            tds.add(TR(TD(link(datasetLabel).href(datasetURL.replaceParameter("datasetId", dataset.getDatasetId())).clearClasses())));
+            tds.add(TR(TD(simpleLink(datasetLabel, datasetURL.replaceParameter("datasetId", dataset.getDatasetId())))));
         }
 
         return TABLE(tds);
diff --git a/study/src/org/labkey/study/view/importDatasetSchema.jsp b/study/src/org/labkey/study/view/importDatasetSchema.jsp
index 134ff7db0ec..d752176a565 100644
--- a/study/src/org/labkey/study/view/importDatasetSchema.jsp
+++ b/study/src/org/labkey/study/view/importDatasetSchema.jsp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.util.element.TextArea.TextAreaBuilder"%>
+<%@ page import="org.labkey.api.util.TextAreaBuilder"%>
 <%@ page import="org.labkey.api.view.HttpView"%>
 <%@ page import="org.labkey.study.controllers.BaseStudyController.StudyJspView" %>
 <%@ page import="org.labkey.study.controllers.StudyController.ImportDatasetSchemaAction" %>
diff --git a/study/src/org/labkey/study/view/manageMasterPatientConfig.jsp b/study/src/org/labkey/study/view/manageMasterPatientConfig.jsp
index 2494c4c09b4..04dfc6a2cc0 100644
--- a/study/src/org/labkey/study/view/manageMasterPatientConfig.jsp
+++ b/study/src/org/labkey/study/view/manageMasterPatientConfig.jsp
@@ -22,9 +22,9 @@
 <%@ page import="org.labkey.api.exp.PropertyType" %>
 <%@ page import="org.labkey.api.study.MasterPatientIndexService" %>
 <%@ page import="org.labkey.api.util.HelpTopic" %>
+<%@ page import="org.labkey.api.util.InputBuilder.Input" %>
 <%@ page import="org.labkey.api.util.JavaScriptFragment" %>
-<%@ page import="org.labkey.api.util.element.Input" %>
-<%@ page import="org.labkey.api.util.element.Select" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -172,7 +172,7 @@ else
 {
 %>
 <labkey:form method="POST" layout="horizontal" onsubmit="LABKEY.setSubmit(true);">
-    <%= new Select.SelectBuilder().name("schema").id("schemaNameInput").label("Schema *")
+    <%= new SelectBuilder().name("schema").id("schemaNameInput").label("Schema *")
             .layout(Input.Layout.HORIZONTAL)
             .required(true)
             .contextContent("The schema name of the query used to provide patient data to the Master Patient Index Provider")
@@ -180,7 +180,7 @@ else
             .formGroup(true)
             .disabled(true)
     %>
-    <%= new Select.SelectBuilder().name("query").id("queryNameInput").label("Query *")
+    <%= new SelectBuilder().name("query").id("queryNameInput").label("Query *")
             .layout(Input.Layout.HORIZONTAL)
             .required(true)
             .contextContent("The query used to provide patient data to the Master Patient Index Provider")
@@ -198,14 +198,14 @@ else
     <%
         } else {
     %>
-    <%= new Select.SelectBuilder().name("dataset").id("datasetInput").label("UID Dataset *")
+    <%= new SelectBuilder().name("dataset").id("datasetInput").label("UID Dataset *")
             .layout(Input.Layout.HORIZONTAL)
             .required(true)
             .contextContent("The dataset to store the universal ID returned from the Master Patient Index")
             .forceSmallContext(true)
             .formGroup(true)
     %>
-    <%= new Select.SelectBuilder().name("fieldName").id("fieldInput").label("UID Field *")
+    <%= new SelectBuilder().name("fieldName").id("fieldInput").label("UID Field *")
             .layout(Input.Layout.HORIZONTAL)
             .required(true)
             .contextContent("The field in the dataset to store the universal ID")
diff --git a/study/src/org/labkey/study/view/manageTimepoints.jsp b/study/src/org/labkey/study/view/manageTimepoints.jsp
index 07cda198ee2..e440c35c5c5 100644
--- a/study/src/org/labkey/study/view/manageTimepoints.jsp
+++ b/study/src/org/labkey/study/view/manageTimepoints.jsp
@@ -106,7 +106,7 @@
 
 <% if (timepoints.size() > 0) { %>
 <labkey:panel title="Timepoints" width="800">
-<p>NOTE: If you edit the day range of timepoints, use <%=link("Recompute Timepoints").href(urlFor(UpdateParticipantVisitsAction.class)).clearClasses().usePost()%>
+<p>NOTE: If you edit the day range of timepoints, use <%=simpleLink("Recompute Timepoints", urlFor(UpdateParticipantVisitsAction.class)).usePost()%>
 to assign dataset data to the correct timepoints.</p>
 <table class="labkey-data-region-legacy labkey-show-borders">
     <tr>
diff --git a/study/src/org/labkey/study/view/masterPatientProvider.jsp b/study/src/org/labkey/study/view/masterPatientProvider.jsp
index e750490b73a..180e3a23dc4 100644
--- a/study/src/org/labkey/study/view/masterPatientProvider.jsp
+++ b/study/src/org/labkey/study/view/masterPatientProvider.jsp
@@ -19,9 +19,9 @@
 <%@ page import="org.labkey.api.data.PropertyManager" %>
 <%@ page import="org.labkey.api.study.MasterPatientIndexService" %>
 <%@ page import="org.labkey.api.util.HelpTopic" %>
-<%@ page import="org.labkey.api.util.element.Input" %>
-<%@ page import="org.labkey.api.util.element.Option" %>
-<%@ page import="org.labkey.api.util.element.Select" %>
+<%@ page import="org.labkey.api.util.InputBuilder.Input" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.study.controllers.StudyController" %>
 <%@ page import="java.util.Collection" %>
 <%@ page extends="org.labkey.api.jsp.FormPage" %>
@@ -40,14 +40,14 @@
     }
 
     Collection<MasterPatientIndexService> services = MasterPatientIndexService.getProviders();
-    Select.SelectBuilder options = new Select.SelectBuilder().name("type").label("Type")
+    SelectBuilder options = new SelectBuilder().name("type").label("Type")
             .layout(Input.Layout.HORIZONTAL)
             .formGroup(true)
-            .addOption(new Option.OptionBuilder().build());
+            .addOption(new OptionBuilder().build());
 
     for (MasterPatientIndexService svc : services)
     {
-        options.addOption(new Option.OptionBuilder().value(svc.getName())
+        options.addOption(new OptionBuilder().value(svc.getName())
                 .label(svc.getName())
                 .selected(svc.getName().equals(type))
                 .build());
diff --git a/study/src/org/labkey/study/view/overview.jsp b/study/src/org/labkey/study/view/overview.jsp
index c9adced6369..3097fe0bf56 100644
--- a/study/src/org/labkey/study/view/overview.jsp
+++ b/study/src/org/labkey/study/view/overview.jsp
@@ -31,8 +31,8 @@
 <%@ page import="org.labkey.api.study.Visit" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.HtmlStringBuilder" %>
-<%@ page import="org.labkey.api.util.Link.LinkBuilder" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.LinkBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
diff --git a/wiki/src/org/labkey/wiki/query/PathDisplayColumn.java b/wiki/src/org/labkey/wiki/query/PathDisplayColumn.java
index a7fe4f4de4b..3172ad7f75e 100644
--- a/wiki/src/org/labkey/wiki/query/PathDisplayColumn.java
+++ b/wiki/src/org/labkey/wiki/query/PathDisplayColumn.java
@@ -25,7 +25,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.Link;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -142,7 +142,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 String url = s.eval(newRow);
                 if (url != null)
                 {
-                    out.write(new Link.LinkBuilder(part).href(url).clearClasses());
+                    out.write(new LinkBuilder(part).href(url).clearClasses());
                 }
                 else
                 {
diff --git a/wiki/src/org/labkey/wiki/view/customizeWiki.jsp b/wiki/src/org/labkey/wiki/view/customizeWiki.jsp
index 3aa36018eda..56219376289 100644
--- a/wiki/src/org/labkey/wiki/view/customizeWiki.jsp
+++ b/wiki/src/org/labkey/wiki/view/customizeWiki.jsp
@@ -17,7 +17,7 @@
 %>
 <%@ page import="org.apache.commons.lang3.StringUtils"%>
 <%@ page import="org.labkey.api.data.Container" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.Portal" %>
 <%@ page import="org.labkey.wiki.WikiController" %>
diff --git a/wiki/src/org/labkey/wiki/view/wikiEdit.jsp b/wiki/src/org/labkey/wiki/view/wikiEdit.jsp
index 282d84f96bf..a3326c8a559 100644
--- a/wiki/src/org/labkey/wiki/view/wikiEdit.jsp
+++ b/wiki/src/org/labkey/wiki/view/wikiEdit.jsp
@@ -18,8 +18,8 @@
 <%@ page import="org.labkey.api.attachments.Attachment" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.HtmlStringBuilder" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
-<%@ page import="org.labkey.api.util.element.Select.SelectBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
diff --git a/wiki/src/org/labkey/wiki/view/wikiManage.jsp b/wiki/src/org/labkey/wiki/view/wikiManage.jsp
index 203a3373660..ab6ce8db190 100644
--- a/wiki/src/org/labkey/wiki/view/wikiManage.jsp
+++ b/wiki/src/org/labkey/wiki/view/wikiManage.jsp
@@ -19,8 +19,8 @@
 <%@ page import="org.labkey.api.data.Container"%>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.HtmlStringBuilder" %>
-<%@ page import="org.labkey.api.util.element.Option.OptionBuilder" %>
-<%@ page import="org.labkey.api.util.element.Select.SelectBuilder" %>
+<%@ page import="org.labkey.api.util.OptionBuilder" %>
+<%@ page import="org.labkey.api.util.SelectBuilder" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.ViewContext" %>
 <%@ page import="org.labkey.wiki.WikiController.DeleteAction" %>