diff --git a/src/components/sectionedForm/SectionedFormLayout.module.css b/src/components/sectionedForm/SectionedFormLayout.module.css
index 9ad6a047..ca7abf60 100644
--- a/src/components/sectionedForm/SectionedFormLayout.module.css
+++ b/src/components/sectionedForm/SectionedFormLayout.module.css
@@ -1,6 +1,5 @@
 @value m-medium: (min-width: 768px);
 
-/* The purpose of this wrappper is for the */
 .layoutWrapper {
     display: flex;
     flex-direction: column;
@@ -31,7 +30,6 @@
     background-color: #fff;
     min-width: var(--sidebar-width);
     height: 100%;
-    border-radius: 0;
     border-inline-end: 1px solid var(--colors-grey300);
 }
 
@@ -39,7 +37,7 @@
     grid-area: footer;
     width: 100%;
     background: var(--colors-white);
-    border-top: 1px solid var(--colors-grey300);
+    border-block-start: 1px solid var(--colors-grey300);
     display: flex;
 }
 
diff --git a/src/lib/form/sectionedForm/SectionedFormContext.tsx b/src/lib/form/sectionedForm/SectionedFormContext.tsx
index e7876438..5f6b0920 100644
--- a/src/lib/form/sectionedForm/SectionedFormContext.tsx
+++ b/src/lib/form/sectionedForm/SectionedFormContext.tsx
@@ -1,5 +1,5 @@
 import React, { createContext, useState } from 'react'
-import { SectionDescriptor, SectionedFormDescriptor } from './formDescriptor'
+import { SectionDescriptor, SectionedFormDescriptor } from './types'
 
 /* Some of the types in this file may look complex.
     However they are here to help type-safety and autocommpletion for consumers.
@@ -50,6 +50,7 @@ function createContextValue<const T extends SectionedFormDescriptor>(
         },
     }
 }
+
 type SectionFormContextValue<T extends SectionedFormDescriptor> = ReturnType<
     typeof createContextValue<T>
 >
@@ -62,12 +63,12 @@ export const SectionedFormDescriptorProvider = <
     T extends SectionedFormDescriptor
 >({
     children,
-    initialValue,
+    formDescriptor,
 }: {
-    initialValue: T
+    formDescriptor: T
     children: React.ReactNode
 }) => {
-    const [contextValue] = useState(() => createContextValue(initialValue))
+    const [contextValue] = useState(() => createContextValue(formDescriptor))
 
     return (
         <SectionedFormContext.Provider value={contextValue}>
diff --git a/src/lib/form/sectionedForm/types.ts b/src/lib/form/sectionedForm/types.ts
index d57a6264..defeb215 100644
--- a/src/lib/form/sectionedForm/types.ts
+++ b/src/lib/form/sectionedForm/types.ts
@@ -5,11 +5,9 @@ export type FieldDescriptor<T = unknown> = {
     name: keyof T | (string & {})
 }
 
-export type SectionDescriptor<T> = {
+export type SectionDescriptor<T = unknown> = {
     label: string
     name: string
-    // keyof T | (string & {}) allows auto-completion for fields, while also allowing
-    // any other string to be used as a key
     fields: FieldDescriptor<T>[]
 }
 
diff --git a/src/pages/dataSets/New.tsx b/src/pages/dataSets/New.tsx
index 043c9bce..70084fa5 100644
--- a/src/pages/dataSets/New.tsx
+++ b/src/pages/dataSets/New.tsx
@@ -15,9 +15,10 @@ import { initialValues, validate } from './form/dataSetFormSchema'
 import { DataSetFormDescriptor } from './form/formDescriptor'
 
 const section = SECTIONS_MAP.dataSet
+
 export const Component = () => {
     return (
-        <SectionedFormDescriptorProvider initialValue={DataSetFormDescriptor}>
+        <SectionedFormDescriptorProvider formDescriptor={DataSetFormDescriptor}>
             <FormBase
                 onSubmit={useOnSubmitNew({ section })}
                 initialValues={initialValues}
diff --git a/src/pages/dataSets/form/DataSetFormContents.tsx b/src/pages/dataSets/form/DataSetFormContents.tsx
index ed28994e..2781a320 100644
--- a/src/pages/dataSets/form/DataSetFormContents.tsx
+++ b/src/pages/dataSets/form/DataSetFormContents.tsx
@@ -7,12 +7,12 @@ import {
     StandardFormField,
     StandardFormSectionDescription,
     StandardFormSectionTitle,
+    SectionedFormSectionRouter,
 } from '../../../components'
 import {
     SectionedFormSection,
     SectionedFormSections,
 } from '../../../components/sectionedForm'
-import { SectionedFormSectionRouter } from '../../../components/sectionedForm/SectionedFormSectionRouter'
 import { SECTIONS_MAP, useSectionedFormDescriptor } from '../../../lib'
 import { CategoryComboField } from '../../dataElements/fields'
 import { DataSetFormDescriptor } from './formDescriptor'
diff --git a/src/pages/dataSets/form/formDescriptor.tsx b/src/pages/dataSets/form/formDescriptor.tsx
index fa0387c6..e44796d7 100644
--- a/src/pages/dataSets/form/formDescriptor.tsx
+++ b/src/pages/dataSets/form/formDescriptor.tsx
@@ -1,9 +1,5 @@
 import i18n from '@dhis2/d2-i18n'
-import {
-    createUseSelectedSection,
-    SectionedFormDescriptor,
-    useSelectedSection,
-} from '../../../lib'
+import { SectionedFormDescriptor } from '../../../lib'
 import { DataSetFormValues } from './fieldFilters'
 
 export const DataSetFormDescriptor = {