Clean up

app.py

@@ -305,6 +305,7 @@ with gr.Blocks() as demo_leaderboard:
                 )
             with gr.Row():
                 shown_columns = gr.CheckboxGroup(
+                    label="Select columns to show",
                     choices=[
                         c.name
                         for c in fields(AutoEvalColumn)
@@ -315,7 +316,6 @@ with gr.Blocks() as demo_leaderboard:
                         for c in fields(AutoEvalColumn)
                         if c.displayed_by_default and not c.hidden and not c.never_hidden
                     ],
-                    label="Select columns to show",
                     elem_id="column-select",
                 )
             with gr.Row():
@@ -471,29 +471,29 @@ with gr.Blocks() as demo_submission:
             model_name_textbox = gr.Textbox(label="Model name")
             revision_name_textbox = gr.Textbox(label="Revision commit", placeholder="main")
             model_type = gr.Dropdown(
-                choices=[t.to_str(" : ") for t in ModelType if t != ModelType.Unknown],
                 label="Model type",
+                choices=[t.to_str(" : ") for t in ModelType if t != ModelType.Unknown],
                 multiselect=False,
                 value=None,
             )
 
         with gr.Column():
             precision = gr.Dropdown(
-                choices=[i.value.name for i in Precision if i != Precision.Unknown],
                 label="Precision",
+                choices=[i.value.name for i in Precision if i != Precision.Unknown],
                 multiselect=False,
                 value="float16",
             )
             weight_type = gr.Dropdown(
-                choices=[i.value.name for i in WeightType],
                 label="Weights type",
+                choices=[i.value.name for i in WeightType],
                 multiselect=False,
                 value="Original",
             )
             base_model_name_textbox = gr.Textbox(label="Base model (for delta or adapter weights)")
             add_special_tokens = gr.Dropdown(
-                choices=[i.value.name for i in AddSpecialTokens if i != AddSpecialTokens.Unknown],
                 label="AddSpecialTokens",
+                choices=[i.value.name for i in AddSpecialTokens if i != AddSpecialTokens.Unknown],
                 multiselect=False,
                 value="False",
             )
@@ -533,8 +533,8 @@ with gr.Blocks(css=custom_css) as demo:
     with gr.Row():
         with gr.Accordion("📙 Citation", open=False):
             citation_button = gr.Textbox(
-                value=CITATION_BUTTON_TEXT,
                 label=CITATION_BUTTON_LABEL,
+                value=CITATION_BUTTON_TEXT,
                 lines=20,
                 elem_id="citation-button",
                 show_copy_button=True,