diff --git a/package-lock.json b/package-lock.json
index 88b10f6..328effc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Rec-to-NWB YAML Generator",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 232c5e9..9892c89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Rec-to-NWB YAML Generator",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Create YAML File for Spyglass",
   "keywords": [
     "electron",
diff --git a/src/App.js b/src/App.js
index 0d36b0e..77d50f3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -28,6 +28,7 @@ import {
   titleCase,
   showCustomValidityError,
   stringToInteger,
+  isProduction,
   useMount,
 } from './utils';
 import {
@@ -652,7 +653,9 @@ const generateYMLFile = (e) => {
 
   if (isValid && isFormValid) {
     const yAMLForm = convertObjectToYAMLString(form);
-    createYAMLFile('metaData.yml', yAMLForm);
+    const fileNameDate = form.subject.date_of_birth.substring(0,10).replaceAll('-', '');
+    const subjectId = formData.subject.subject_id.toLocaleLowerCase();
+    createYAMLFile(`${fileNameDate}_${subjectId}_metadata.yml`, yAMLForm);
     return;
   }
 
@@ -845,7 +848,7 @@ useEffect(() => {
 
    return <>
     <div className="home-region">
-      <a href="/">
+      <a href={isProduction() ? '/rec_to_nwb_yaml_creator' : '/'}>
         <img src={logo} alt="Loren Frank Lab logo"/>
       </a>
     </div>
@@ -934,7 +937,8 @@ useEffect(() => {
           inputPlaceholder="No experimenter"
           defaultValue={formData.experimenter_name}
           title="Experimenter Name"
-          placeholder="LastName, FirstName or LastName, FirstName MiddleInitial. or LastName, FirstName MiddleName"
+          placeholder="LastName, FirstName"
+          listPlaceHolder="LastName, FirstName"
           updateFormData={updateFormData}
           metaData={{
             nameValue: 'experimenter_name',
@@ -1955,6 +1959,9 @@ useEffect(() => {
                             index,
                           })
                         }
+                        metaData={{
+                          index,
+                        }}
                         onMapInput={onMapInput}
                       />
                     </div>
diff --git a/src/element/ListElement.jsx b/src/element/ListElement.jsx
index d6275d1..977902b 100644
--- a/src/element/ListElement.jsx
+++ b/src/element/ListElement.jsx
@@ -23,6 +23,7 @@ const ListElement = (prop) => {
     metaData,
     required,
     inputPlaceholder,
+    listPlaceHolder,
     updateFormData,
     step,
     readOnly,
@@ -64,6 +65,7 @@ const ListElement = (prop) => {
   const listData = useRef();
 
   const valueToAdd = useRef('');
+  const textPlaceHolder = listPlaceHolder ? listPlaceHolder : `Type ${title}`;
 
   return (
     <label className="container" htmlFor={id}>
@@ -83,7 +85,7 @@ const ListElement = (prop) => {
             <input
               name={name}
               type={type}
-              placeholder={`Type ${title}`}
+              placeholder={textPlaceHolder}
               ref={valueToAdd}
               step={step}
               onKeyPress={e => addListItemViaEnterKey(e, valueToAdd)}
@@ -102,6 +104,7 @@ ListElement.propType = {
   type: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   placeholder: PropTypes.string,
+  listPlaceHolder: PropTypes.string,
   required: PropTypes.bool,
   readOnly: PropTypes.bool,
   inputPlaceholder: PropTypes.string,
@@ -119,6 +122,7 @@ ListElement.defaultProps = {
   readOnly: false,
   metaData: {},
   inputPlaceholder: '',
+  listPlaceHolder: null,
   step: 'any',
   required: false,
 };
diff --git a/src/ntrode/ChannelMap.jsx b/src/ntrode/ChannelMap.jsx
index d0cc669..aef830d 100644
--- a/src/ntrode/ChannelMap.jsx
+++ b/src/ntrode/ChannelMap.jsx
@@ -14,7 +14,7 @@ import InfoIcon from './../element/InfoIcon';
  * @returns Virtual DOM of the map for ntrode_electrode_group_channel_map
  */
 const ChannelMap = (prop) => {
-  const { nTrodeItems, onBlur, onMapInput, electrodeGroupId, updateFormArray } =
+  const { nTrodeItems, onBlur, onMapInput, electrodeGroupId, updateFormArray, metaData } =
     prop;
 
   const getOptions = (options, mapValue, mapValues) => {
@@ -67,7 +67,7 @@ const ChannelMap = (prop) => {
                     updateFormArray={updateFormArray}
                     metaData={{
                       nameValue: 'bad_channels',
-                      index,
+                      index: metaData.index,
                       keyValue: 'ntrode_electrode_group_channel_map',
                     }}
                     onChange={updateFormArray}
@@ -139,6 +139,7 @@ ChannelMap.propType = {
   onBlur: PropTypes.func,
   updateFormArray: PropTypes.func,
   onMapInput: PropTypes.func,
+  metaData: PropTypes.instanceOf(Object),
 };
 
 export default ChannelMap;
diff --git a/src/utils.js b/src/utils.js
index a460e35..5fde7ea 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -117,3 +117,16 @@ export const sanitizeTitle = (title) => {
     .trim()
     .replace(/[^a-z0-9]/gi, '');
 };
+
+
+/**
+ * Checks if running in Production
+ *
+ * @returns True if running in Production, false otherwise
+ */
+export const isProduction = () => {
+  // It is better to use node.js. But that requires adding a package.
+  // See - https://stackoverflow.com/a/70989566/178550. This is sufficient for
+  // now but can be updated if the need arises
+  return window.location.href.includes('https://lorenfranklab.github.io');
+};