diff --git a/docs/contributor_guide/development_setup.md b/docs/contributor_guide/development_setup.md
index 45cdb4c9b..7c463e37b 100644
--- a/docs/contributor_guide/development_setup.md
+++ b/docs/contributor_guide/development_setup.md
@@ -10,6 +10,12 @@ The `jlpm` command is JupyterLab's pinned version of
 [`yarn`](https://yarnpkg.com) or [`npm`](https://www.npmjs.com) in lieu of `jlpm` below.
 :::
 
+### Install the essential tools
+1. Install Git: Follow the [official installation instructions](https://git-scm.com/downloads) for your operating system.
+2. Install Python: Go to the official Python website and follow the installation instructions for your operating system (Windows, macOS, or Linux).
+3. (Recommended) Install Micromamba: Go to the official Micromamba website and follow the installation instructions for your operating system (Windows, macOS, or Linux).
+
+
 ### Clone the source
 
 ```bash
diff --git a/packages/base/src/formbuilder/creationform.tsx b/packages/base/src/formbuilder/creationform.tsx
index 16f68db11..a74881ae5 100644
--- a/packages/base/src/formbuilder/creationform.tsx
+++ b/packages/base/src/formbuilder/creationform.tsx
@@ -132,7 +132,7 @@ export class CreationForm extends React.Component<ICreationFormProps, any> {
       if (!this.props.createLayer) {
         sourceSchema['required'] = ['name', ...sourceSchema['required']];
         sourceSchema['properties'] = {
-          name: { type: 'string', description: 'The name of the source' },
+          name: { type: 'string', description: 'The name of the source' , 'ui:autofocus':true},
           ...sourceSchema['properties'],
         };
       }
@@ -193,45 +193,45 @@ export class CreationForm extends React.Component<ICreationFormProps, any> {
 
     return (
       <div>
-        {this.props.createSource && (
+        {this.props.createLayer && (
           <div>
-            <h3>Source Properties</h3>
-            <SourceForm
+            <h3>Layer Properties</h3>
+            <LayerForm
               formContext="create"
+              sourceType={this.props.sourceType}
               model={this.jGISModel}
               filePath={this.filePath}
-              schema={sourceSchema}
-              sourceData={this.props.sourceData}
+              schema={layerSchema}
+              sourceData={layerData}
               syncData={(properties: { [key: string]: any }) => {
-                sourceCreationPromise?.resolve(properties);
+                layerCreationPromise?.resolve(properties);
               }}
               ok={this.props.ok}
               cancel={this.props.cancel}
-              formChangedSignal={this.sourceFormChangedSignal}
+              sourceFormChangedSignal={this.sourceFormChangedSignal}
               formErrorSignal={this.props.formErrorSignal}
               dialogOptions={this.props.dialogOptions}
-              sourceType={this.props.sourceType}
             />
           </div>
         )}
-        {this.props.createLayer && (
+        {this.props.createSource && (
           <div>
-            <h3>Layer Properties</h3>
-            <LayerForm
+            <h3>Source Properties</h3>
+            <SourceForm
               formContext="create"
-              sourceType={this.props.sourceType}
               model={this.jGISModel}
               filePath={this.filePath}
-              schema={layerSchema}
-              sourceData={layerData}
+              schema={sourceSchema}
+              sourceData={this.props.sourceData}
               syncData={(properties: { [key: string]: any }) => {
-                layerCreationPromise?.resolve(properties);
+                sourceCreationPromise?.resolve(properties);
               }}
               ok={this.props.ok}
               cancel={this.props.cancel}
-              sourceFormChangedSignal={this.sourceFormChangedSignal}
+              formChangedSignal={this.sourceFormChangedSignal}
               formErrorSignal={this.props.formErrorSignal}
               dialogOptions={this.props.dialogOptions}
+              sourceType={this.props.sourceType}
             />
           </div>
         )}