diff --git a/templates/button.php b/templates/button.php
index f451255ec481faaf1e685c2ffbbc68279d540f97..43c21190ad4326181dd29fd4a45f930642a7cc26 100644
--- a/templates/button.php
+++ b/templates/button.php
@@ -11,53 +11,21 @@
 ?>
 
 <button
-				<?php
-if ($field->has_classes()) {
-    ?>class="<?php
-    echo \esc_attr($field->get_classes());
-    ?>"<?php
-}
-?>
-				<?php
-foreach ($field->get_attributes([]) as $key => $val) {
-    ?>
-					<?php
-    echo $key;
-    ?>="<?php
-    echo \esc_attr($val);
-    ?>"
-				<?php
-}
-?>
-				type="<?php
-echo \esc_attr($field->get_type());
-?>"
-				name="<?php
-echo \esc_attr($name_prefix);
-?>[<?php
-echo \esc_attr($field->get_name());
-?>]"
-				id="<?php
-echo \esc_attr($field->get_id());
-?>"
-				value="<?php
-echo \esc_html($value);
-?>"
-				<?php
-if ($field->is_required()) {
-    ?>required="required"<?php
-}
-?>
-				<?php
-if ($field->is_disabled()) {
-    ?>disabled="disabled"<?php
-}
-?>
-				<?php
-if ($field->is_readonly()) {
-    ?>readonly="readonly"<?php
-}
-?>
-			>
-<?php echo \esc_html($field->get_label()); ?>
-</button>
+<?php if ($field->has_classes()): ?>
+	class="<?php echo \esc_attr($field->get_classes()); ?>"
+<?php endif; ?>
+
+<?php foreach ($field->get_attributes([]) as $key => $val): ?>
+	<?php echo $key.'="'.\esc_attr($val).'"'; ?>
+<?php endforeach; ?>
+
+	type="<?php echo \esc_attr($field->get_type()); ?>"
+	name="<?php echo \esc_attr($name_prefix).'['.\esc_attr($field->get_name()).']'?>"
+	id="<?php echo \esc_attr($field->get_id()); ?>"
+	value="<?php echo \esc_html($value); ?>"
+
+	<?php if ($field->is_required()): ?>required="required"<?php endif; ?>
+	<?php if ($field->is_disabled()): ?>disabled="disabled"<?php endif; ?>
+	<?php if ($field->is_readonly()): ?>readonly="readonly"<?php endif; ?>
+
+><?php echo \esc_html($field->get_label()); ?></button>