diff --git a/src/lib/widgets/RadioWidget.svelte b/src/lib/widgets/RadioWidget.svelte
index 78788bb..f33f5f7 100644
--- a/src/lib/widgets/RadioWidget.svelte
+++ b/src/lib/widgets/RadioWidget.svelte
@@ -39,12 +39,12 @@
  }
 </script>
 
-<div class="wrapper gradio-checkbox">
+<div class="wrapper gradio-radio">
     <div class="inner">
         {#key $propsChanged}
             {#key $attrsChanged}
                 {#if node !== null && node.properties.choices}
-                    <Block>
+                    <Block type="fieldset">
                         <Radio
                             elem_id="radio"
                             choices={node.properties.choices}
diff --git a/src/scss/ux.scss b/src/scss/ux.scss
index d15bb9a..9f9f534 100644
--- a/src/scss/ux.scss
+++ b/src/scss/ux.scss
@@ -390,8 +390,8 @@ div.block.padded {
 fieldset.block.padded
 {
     background-color: var(--ae-panel-bg-color) !important;
-	/*border-width: var(--ae-border-width) !important;*/
-    /*border-color: var(--ae-panel-border-color) !important;*/
+	border-width: var(--ae-border-width) !important;
+    border-color: var(--ae-panel-border-color) !important;
     border-radius: var(--ae-panel-border-radius) !important;
 }
 
@@ -440,7 +440,7 @@ div.gradio-row>.form{
 }
 
 .wrap.svelte-1p9xokt.svelte-1p9xokt.svelte-1p9xokt label,
-.wrap.svelte-1qxcj04.svelte-1qxcj04.svelte-1qxcj04 label,
+.gradio-radio label,
 button.tool.secondary,
 button.secondary,
 .gradio-dropdown label .wrap,
@@ -571,7 +571,7 @@ input[type=email] {
 	align-self: flex-start;
 }
 
-span.svelte-1gfkn6j:not(.has-info) {
+.gradio-radio span:not(.has-info) {
     margin-top: 1px;
     margin-left: 1px;
 	margin-bottom: var(--ae-inside-padding-size);
@@ -873,6 +873,11 @@ input[type=range]::-ms-fill-upper {
     }
 }
 
+.comfy-image-widget > .block {
+	background: var(--ae-main-bg-color);
+	border-color: var(--ae-panel-border-color);
+}
+
 .comfy-toggle-button {
     > .lg {
         border-color: var(--ae-subpanel-border-color) !important;