diff --git a/src/controls/group.rs b/src/controls/group.rs
index fa0f2b5..f8e1919 100644
--- a/src/controls/group.rs
+++ b/src/controls/group.rs
@@ -11,12 +11,9 @@ impl<FD: FormToolData> FormBuilder<FD> {
     /// This creates a subsection of the form that controls can be added to
     /// like a normal form.
     pub fn group(mut self, builder: impl Fn(FormBuilder<FD>) -> FormBuilder<FD>) -> Self {
-        let mut group_builder = FormBuilder::new_group(self.cx);
+        let mut group_builder = FormBuilder::new_group(self.cx.clone());
         group_builder = builder(group_builder);
 
-        // Take context back
-        self.cx = group_builder.cx;
-
         for validation in group_builder.validations {
             self.validations.push(validation);
         }
@@ -34,7 +31,6 @@ impl<FD: FormToolData> FormBuilder<FD> {
             });
 
             let view = fs.group(render_data.clone());
-            // TODO: add conditional rendering
 
             let validation_cb = move || {
                 let mut success = true;
diff --git a/src/form_builder.rs b/src/form_builder.rs
index 8e75e4c..fbbd272 100644
--- a/src/form_builder.rs
+++ b/src/form_builder.rs
@@ -25,7 +25,7 @@ pub struct FormBuilder<FD: FormToolData> {
     pub(crate) validations: Vec<Rc<dyn ValidationFn<FD>>>,
     /// The list of functions that will render the form.
     pub(crate) render_fns: Vec<Box<dyn RenderFn<FD::Style, FD>>>,
-    /// The list of styling attributes applied on the form level
+    /// The list of styling attributes applied on the form level.
     pub(crate) styles: Vec<<FD::Style as FormStyle>::StylingAttributes>,
 }