diff --git a/packages/jv-input-controls/jest.config.ts b/packages/jv-input-controls/jest.config.ts
index ef7ff71c..9ebb6872 100644
--- a/packages/jv-input-controls/jest.config.ts
+++ b/packages/jv-input-controls/jest.config.ts
@@ -9,6 +9,7 @@ const conf: Config = {
   transform: {
     "^.+\\.tsx?$": "ts-jest",
   },
+  setupFilesAfterEnv: ["./test/env.setup.ts"],
 };
 
 export default conf;
diff --git a/packages/jv-input-controls/src/assets/locales/en.json b/packages/jv-input-controls/src/assets/locales/en.json
index 586fb2f0..0695633e 100644
--- a/packages/jv-input-controls/src/assets/locales/en.json
+++ b/packages/jv-input-controls/src/assets/locales/en.json
@@ -1,6 +1,7 @@
 {
   "translation": {
     "error": "Error",
-    "not.yet.implemented": "This resource contains controls that are not yet supported."
+    "not.yet.implemented": "This resource contains controls that are not yet supported.",
+    "error.not.matching.pattern": "This field does not match the required pattern."
   }
 }
diff --git a/packages/jv-input-controls/src/components/NotYetImplementedMessage.tsx b/packages/jv-input-controls/src/components/NotYetImplementedMessage.tsx
index d437c639..2e12f10f 100644
--- a/packages/jv-input-controls/src/components/NotYetImplementedMessage.tsx
+++ b/packages/jv-input-controls/src/components/NotYetImplementedMessage.tsx
@@ -1,8 +1,8 @@
 import { JVMessage, JVTypography, JVIcon } from "@jaspersoft/jv-ui-components";
-import { useTranslation } from "react-i18next";
+import i18n from "../i18n";
 
 export default function NotYetImplementedMessage() {
-  const { t } = useTranslation() as { t: (k: string) => string };
+  const t = i18n.t;
   return (
     <JVMessage
       type="error"
diff --git a/packages/jv-input-controls/src/controls/hooks/useErrorMsg.ts b/packages/jv-input-controls/src/controls/hooks/useErrorMsg.ts
index f56188a5..0e68537e 100644
--- a/packages/jv-input-controls/src/controls/hooks/useErrorMsg.ts
+++ b/packages/jv-input-controls/src/controls/hooks/useErrorMsg.ts
@@ -6,6 +6,7 @@ import {
   getBaseInputControlProps,
 } from "../BaseInputControl";
 import { useEffectAfterInitial } from "./useEffectAfterInitial";
+import i18n from "../../i18n";
 
 interface UseMandatoryMsgProps {
   textValue: string | string[];
@@ -20,6 +21,7 @@ export const useErrorMsg = ({
   props,
   minAndMaxDate,
 }: UseMandatoryMsgProps) => {
+  const t = i18n.t;
   const [msg, setMsg] = useState<string>(defaultValue);
 
   const validateTextValue = (textToValidate: string): string => {
@@ -32,10 +34,7 @@ export const useErrorMsg = ({
       const regex = new RegExp(props.dataType.pattern);
       regex.lastIndex = 0;
       const isMatch = regex.test(textToValidate);
-      // TODO: we will need to translate this message once we add the i18n support:
-      theMsg = !isMatch
-        ? "This field does not match the required pattern."
-        : "";
+      theMsg = isMatch ? "" : t("error.not.matching.pattern");
     }
     let isError = false;
     if (!theMsg.trim() && minAndMaxDate) {
diff --git a/packages/jv-input-controls/src/controls/hooks/useLiveDateFormattedState.ts b/packages/jv-input-controls/src/controls/hooks/useLiveDateFormattedState.ts
index abae5220..e2debb46 100644
--- a/packages/jv-input-controls/src/controls/hooks/useLiveDateFormattedState.ts
+++ b/packages/jv-input-controls/src/controls/hooks/useLiveDateFormattedState.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import { useState } from "react";
 
 const DEFAULT_DATE_FORMAT = "YYYY-MM-DD";
diff --git a/packages/jv-input-controls/src/controls/hooks/useNumberErrorMsgs.ts b/packages/jv-input-controls/src/controls/hooks/useNumberErrorMsgs.ts
index 5cd8bbf0..62e328ac 100644
--- a/packages/jv-input-controls/src/controls/hooks/useNumberErrorMsgs.ts
+++ b/packages/jv-input-controls/src/controls/hooks/useNumberErrorMsgs.ts
@@ -6,6 +6,7 @@ import {
   getBaseInputControlProps,
 } from "../BaseInputControl";
 import { useEffectAfterInitial } from "./useEffectAfterInitial";
+import { useTranslation } from "react-i18next";
 
 interface UseNumberErrorMsgProps {
   textValue: string;
@@ -16,8 +17,8 @@ export const useNumberErrorMsg = ({
   textValue,
   props,
 }: UseNumberErrorMsgProps) => {
+  const { t } = useTranslation() as { t: (k: string) => string };
   const [msg, setMsg] = useState<string>("");
-
   useEffectAfterInitial(() => {
     // Determine the message based on:
     // 1. whether the field is a number or not
@@ -44,10 +45,7 @@ export const useNumberErrorMsg = ({
       const regex = new RegExp(`${props.dataType.pattern}`);
       regex.lastIndex = 0;
       const isMatch = regex.test(textValue);
-      // TODO: we will need to translate this message once we add the i18n support:
-      theMsg = !isMatch
-        ? "This field does not match the required pattern."
-        : "";
+      theMsg = isMatch ? "" : t("error.not.matching.pattern");
     }
     const valAsNumber = +textValue;
     if (!theMsg.trim()) {
diff --git a/packages/jv-input-controls/src/utils/DateInputControlUtils.ts b/packages/jv-input-controls/src/utils/DateInputControlUtils.ts
index f1841c33..2b9528f8 100644
--- a/packages/jv-input-controls/src/utils/DateInputControlUtils.ts
+++ b/packages/jv-input-controls/src/utils/DateInputControlUtils.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import { ICDataType, ICValidationRule } from "../controls/BaseInputControl";
 import { getValueForVerificationText } from "./NumberUtils";
 import { isEmptyObject } from "./ObjectUtils";
diff --git a/packages/jv-input-controls/src/utils/ErrorMessageUtils.ts b/packages/jv-input-controls/src/utils/ErrorMessageUtils.ts
index 38b19920..de9e0850 100644
--- a/packages/jv-input-controls/src/utils/ErrorMessageUtils.ts
+++ b/packages/jv-input-controls/src/utils/ErrorMessageUtils.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import { ICValidationRule } from "../controls/BaseInputControl";
 
 export const getMandatoryErrorMessage = (
diff --git a/packages/jv-input-controls/src/utils/NumberUtils.ts b/packages/jv-input-controls/src/utils/NumberUtils.ts
index a22c8684..1507f5a3 100644
--- a/packages/jv-input-controls/src/utils/NumberUtils.ts
+++ b/packages/jv-input-controls/src/utils/NumberUtils.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import { ICDataType } from "../controls/BaseInputControl";
 
 const DECIMAL_SEPARATOR = "\\.";
diff --git a/packages/jv-input-controls/test/controls/hooks/useLiveDateFormattedState.test.ts b/packages/jv-input-controls/test/controls/hooks/useLiveDateFormattedState.test.ts
index 89d3a364..6b6cd93f 100644
--- a/packages/jv-input-controls/test/controls/hooks/useLiveDateFormattedState.test.ts
+++ b/packages/jv-input-controls/test/controls/hooks/useLiveDateFormattedState.test.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import { renderHook } from "@testing-library/react";
 import { useLiveDateFormattedState } from "../../../src/controls/hooks/useLiveDateFormattedState";
 
diff --git a/packages/jv-input-controls/test/env.setup.ts b/packages/jv-input-controls/test/env.setup.ts
new file mode 100644
index 00000000..c59c9138
--- /dev/null
+++ b/packages/jv-input-controls/test/env.setup.ts
@@ -0,0 +1,16 @@
+beforeEach(() => {
+  jest.mock("react-i18next", () => ({
+    useTranslation: () => {
+      return {
+        t: (str: any) => str,
+        i18n: {
+          changeLanguage: () => new Promise(() => {}),
+        },
+      };
+    },
+    initReactI18next: {
+      type: "3rdParty",
+      init: () => {},
+    },
+  }));
+});
diff --git a/packages/jv-input-controls/test/panels/BasePanel.test.tsx b/packages/jv-input-controls/test/panels/BasePanel.test.tsx
index d1bb1291..8efbeac7 100644
--- a/packages/jv-input-controls/test/panels/BasePanel.test.tsx
+++ b/packages/jv-input-controls/test/panels/BasePanel.test.tsx
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import { render, screen } from "@testing-library/react";
 import "@testing-library/jest-dom";
 import BasePanel from "../../src/panels/BasePanel";
diff --git a/packages/jv-scheduler/src/components/Stepper/ErrorTemplate.tsx b/packages/jv-scheduler/src/components/Stepper/ErrorTemplate.tsx
index 8ea06759..d2621961 100644
--- a/packages/jv-scheduler/src/components/Stepper/ErrorTemplate.tsx
+++ b/packages/jv-scheduler/src/components/Stepper/ErrorTemplate.tsx
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import React from "react";
 import { JVTypography } from "@jaspersoft/jv-ui-components";
 
diff --git a/packages/jv-scheduler/src/components/Stepper/StepIcon.tsx b/packages/jv-scheduler/src/components/Stepper/StepIcon.tsx
index 5d4b1656..86b77853 100644
--- a/packages/jv-scheduler/src/components/Stepper/StepIcon.tsx
+++ b/packages/jv-scheduler/src/components/Stepper/StepIcon.tsx
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import React from "react";
 import { JVIcon } from "@jaspersoft/jv-ui-components";
 import {
diff --git a/packages/jv-scheduler/src/components/apiFailureError/ErrorConfirmationDialog.tsx b/packages/jv-scheduler/src/components/apiFailureError/ErrorConfirmationDialog.tsx
index fe1d9352..8d18ada8 100644
--- a/packages/jv-scheduler/src/components/apiFailureError/ErrorConfirmationDialog.tsx
+++ b/packages/jv-scheduler/src/components/apiFailureError/ErrorConfirmationDialog.tsx
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import React from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { setApiFailure } from "../../actions/action";
diff --git a/packages/jv-scheduler/src/components/apiFailureError/scheduleAPIError.tsx b/packages/jv-scheduler/src/components/apiFailureError/scheduleAPIError.tsx
index 3614d4ad..51ee0d86 100644
--- a/packages/jv-scheduler/src/components/apiFailureError/scheduleAPIError.tsx
+++ b/packages/jv-scheduler/src/components/apiFailureError/scheduleAPIError.tsx
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import React from "react";
 import {
   JVIcon,
diff --git a/packages/jv-scheduler/src/components/common/ErrorDialog.tsx b/packages/jv-scheduler/src/components/common/ErrorDialog.tsx
index 68799541..9ff7d229 100644
--- a/packages/jv-scheduler/src/components/common/ErrorDialog.tsx
+++ b/packages/jv-scheduler/src/components/common/ErrorDialog.tsx
@@ -1,7 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
 import React from "react";
 
 import {
diff --git a/packages/jv-scheduler/src/constants/globalConfiguration.settings.ts b/packages/jv-scheduler/src/constants/globalConfiguration.settings.ts
index f482b3a9..dcff1efd 100644
--- a/packages/jv-scheduler/src/constants/globalConfiguration.settings.ts
+++ b/packages/jv-scheduler/src/constants/globalConfiguration.settings.ts
@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved.
- * http://www.jaspersoft.com.
- *
- * Unless you have purchased a commercial license agreement from Jaspersoft,
- * the following license terms apply:
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 export default {
   resourceIdNotSupportedSymbols:
     "[~!#\\$%^|\\s`@&*()\\-+={}\\[\\]:;\"'\\<\\>,?/\\|\\\\]",
diff --git a/packages/jv-scheduler/src/hooks/useStoreUpdate.ts b/packages/jv-scheduler/src/hooks/useStoreUpdate.ts
index cf94aa4f..e4cdd990 100644
--- a/packages/jv-scheduler/src/hooks/useStoreUpdate.ts
+++ b/packages/jv-scheduler/src/hooks/useStoreUpdate.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import { useDispatch, useSelector } from "react-redux";
 import { stateValidator } from "../validations/scheduleValidators";
 import {
diff --git a/packages/jv-scheduler/src/store/store.ts b/packages/jv-scheduler/src/store/store.ts
index 736295e2..30504257 100644
--- a/packages/jv-scheduler/src/store/store.ts
+++ b/packages/jv-scheduler/src/store/store.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import { applyMiddleware, createStore } from "redux";
 import thunk from "redux-thunk";
 import { rootReducer } from "../reducer/reducer";
diff --git a/packages/jv-scheduler/src/validations/scheduleValidators.ts b/packages/jv-scheduler/src/validations/scheduleValidators.ts
index 247044f6..7c6e7abd 100644
--- a/packages/jv-scheduler/src/validations/scheduleValidators.ts
+++ b/packages/jv-scheduler/src/validations/scheduleValidators.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright (C) 2005 - 2023. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc. End User License Agreement.
- */
-
 import _ from "underscore";
 // @ts-ignore
 import XRegExp from "xregexp";
diff --git a/packages/jv-ui-components/material-ui/Date/Date.Utils.ts b/packages/jv-ui-components/material-ui/Date/Date.Utils.ts
index 3393e2f6..ee3101c3 100644
--- a/packages/jv-ui-components/material-ui/Date/Date.Utils.ts
+++ b/packages/jv-ui-components/material-ui/Date/Date.Utils.ts
@@ -1,8 +1,3 @@
-/*
- * Copyright © 2005-2024. Cloud Software Group, Inc. All rights reserved. Confidential & Proprietary.
- * Licensed pursuant to commercial Cloud Software Group, Inc End User License Agreement.
- */
-
 import dayjs from "dayjs";
 
 const castValueIfNeeded = (theValue: dayjs.Dayjs): dayjs.Dayjs => {
diff --git a/packages/jv-ui-components/scss/_button.scss b/packages/jv-ui-components/scss/_button.scss
index 7a98bbc6..86a921ff 100644
--- a/packages/jv-ui-components/scss/_button.scss
+++ b/packages/jv-ui-components/scss/_button.scss
@@ -1,25 +1,4 @@
-/*!
- * Copyright (C) 2005 - 2022 TIBCO Software Inc. All rights reserved.
- * http://www.jaspersoft.com.
- *
- * Unless you have purchased a commercial license agreement from Jaspersoft,
- * the following license terms apply:
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* =========================================
+/*! =========================================
     BUTTON MODULE STYLESHEET
 	Last modified date:     Oct 21, 2022
 	Last modified by:       Anna Leeg
@@ -251,7 +230,9 @@
 }
 
 .jv-mButtonToolPlain.jv {
-} // does not have state styling
+}
+
+// does not have state styling
 
 .jv-mButtonTool.jv > .jv-mButton-icon.jv {
   font-size: 16px; // new base font size
@@ -610,18 +591,24 @@
 .jv-mButtonError.jv:focus,
 .jv-mButtonError.jv:hover {
   background-color: $color-errorDark;
-} //broken
+}
+
+//broken
 
 .jv-mButtonError.jv[disabled]:hover,
 .jv-mButtonError.jv-isHovered[disabled].jv {
   background-color: $color-errorMedium;
-} //broken
+}
+
+//broken
 
 .jv-mButtonAttention.jv-isHovered.jv,
 .jv-mButtonAttention.jv:focus,
 .jv-mButtonAttention.jv:hover {
   background-color: $color-attentionDark;
-} //broken
+}
+
+//broken
 
 .jv-mButtonAttention.jv[disabled]:hover,
 .jv-mButtonAttention.jv-isHovered[disabled].jv {
diff --git a/packages/jv-ui-components/scss/_datatable.scss b/packages/jv-ui-components/scss/_datatable.scss
index f77f73e5..528860f2 100644
--- a/packages/jv-ui-components/scss/_datatable.scss
+++ b/packages/jv-ui-components/scss/_datatable.scss
@@ -1,25 +1,4 @@
-/*!
- * Copyright (C) 2005 - 2023 TIBCO Software Inc. All rights reserved.
- * http://www.jaspersoft.com.
- *
- * Unless you have purchased a commercial license agreement from Jaspersoft,
- * the following license terms apply:
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* --------------------------------------------------
+/*! --------------------------------------------------
    TABLE OF CONTENTS
 
     1. DATA TABLE
@@ -62,6 +41,7 @@
 
 .jv-mDatatable-body.jv {
 }
+
 .jv-mDatatable-row.jv {
 }
 
@@ -137,6 +117,7 @@
   line-height: 1.273em;
   padding-top: em(5px);
 }
+
 // Firefox-specific
 @-moz-document url-prefix() {
   .jv-mDatatable-cell-currency.jv,
@@ -201,10 +182,13 @@
 // class names below are used contextually in body and/or header
 .jv-mDatatable-cellRowlabel.jv {
 }
+
 .jv-mDatatable-cellField.jv {
 }
+
 .jv-mDatatable-cellMeasure.jv {
 }
+
 .jv-mDatatable-cellValue.jv {
 }
 
@@ -279,7 +263,9 @@
 
 .jv-mDatatableCrosstab.jv .jv-mDatatable-header.jv .jv-mDatatable-cell-text.jv {
   display: inline-block;
-} /* text and sort icon (below) both need inline-block to display correctly */
+}
+
+/* text and sort icon (below) both need inline-block to display correctly */
 
 .jv-mDatatableCrosstab.jv .jv-mDatatable-header.jv .jv-mDatatable-cell-sort.jv {
   display: inline-block;
@@ -342,7 +328,9 @@
   .jv-mDatatable-rowGroup.jv-mDatatable-rowEven.jv
   .jv-mDatatable-cellValue.jv:not([rowspan]) {
   background-color: #f4f4f4;
-} /* NEW Sept 2023 */
+}
+
+/* NEW Sept 2023 */
 
 .jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowMember.jv {
 }
@@ -353,8 +341,10 @@
 .jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowMemberLast.jv .jv-mDatatable-cellField.jv,
 .jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowMemberLast.jv .jv-mDatatable-cellMeasure.jv,
 .jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowGroup.jv .jv-mDatatable-cellTotal.jv:last-of-type,
-.jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowGroup.jv .jv-mDatatable-cellTotal.jv, /* New Sept 2023, for collapsed crosstab */
-.jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowMember.jv .jv-mDatatable-cellTotal.jv, //for nested crosstabs
+.jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowGroup.jv .jv-mDatatable-cellTotal.jv,
+/* New Sept 2023, for collapsed crosstab */
+.jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-rowMember.jv .jv-mDatatable-cellTotal.jv,
+//for nested crosstabs
 .jv-mDatatableCrosstab.jv .jv-mDatatable-rowValueLast.jv .jv-mDatatable-cellValue.jv {
   border-bottom: 1px solid #d4d4d4;
 }
@@ -372,10 +362,13 @@
   ).jv
   .jv-mDatatable-cellTotal.jv {
   border-bottom: 1px solid transparent;
-} /* NEW Sept 2023 */
+}
+
+/* NEW Sept 2023 */
 
 .jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-cellField.jv:last-of-type,
-.jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-cellMeasure.jv:last-of-type, //no border on inner-most cells
+.jv-mDatatableCrosstab.jv .jv-mDatatable-body.jv .jv-mDatatable-cellMeasure.jv:last-of-type,
+//no border on inner-most cells
 .jv-mDatatableCrosstab.jv .jv-mDatatable-cellValue.jv {
   border-bottom: 1px solid transparent;
 }
@@ -657,6 +650,7 @@
   0% {
     background-position: -400px;
   }
+
   100% {
     background-position: 0;
   }
diff --git a/packages/jv-ui-components/scss/_layout.scss b/packages/jv-ui-components/scss/_layout.scss
index 5f9c8b6f..b65ff945 100644
--- a/packages/jv-ui-components/scss/_layout.scss
+++ b/packages/jv-ui-components/scss/_layout.scss
@@ -1,25 +1,4 @@
-/*!
- * Copyright (C) 2005 - 2022 TIBCO Software Inc. All rights reserved.
- * http://www.jaspersoft.com.
- *
- * Unless you have purchased a commercial license agreement from Jaspersoft,
- * the following license terms apply:
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* ========================================
+/*! ========================================
     LAYOUT RULES
     Last modified date:     Jan 21, 2022
     Last modified by:       Anna Leeg
diff --git a/packages/jv-ui-components/scss/_table.scss b/packages/jv-ui-components/scss/_table.scss
index ac020420..dde26585 100644
--- a/packages/jv-ui-components/scss/_table.scss
+++ b/packages/jv-ui-components/scss/_table.scss
@@ -1,30 +1,3 @@
-/*!
- * Copyright (C) 2005 - 2023 TIBCO Software Inc. All rights reserved.
- * http://www.jaspersoft.com.
- *
- * Unless you have purchased a commercial license agreement from Jaspersoft,
- * the following license terms apply:
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* ====================================
-   TABLE MODULE STYLESHEET
-   Last modified date:    Feb 1, 2023
-   Last modified by:      Anna Leeg
-* ==================================== */
-
 // -----------------------------------------------
 //   TABLE OF CONTENTS
 //
@@ -228,7 +201,8 @@
 // ------------------------------------
 .jv-isClosed.jv > .jv-mTable-cell-expander-icon.jv {
   border-bottom: em(4px, 12px) solid transparent;
-  border-left: em(5px, 12px) solid $grey-textLighter; /* text variable is ok, this is icon inline with text */
+  border-left: em(5px, 12px) solid $grey-textLighter;
+  /* text variable is ok, this is icon inline with text */
   border-top: em(4px, 12px) solid transparent;
   display: inline-block;
   margin-left: em(10px, 12px);
@@ -238,7 +212,8 @@
 .jv-isOpen.jv > .jv-mTable-cell-expander-icon.jv {
   border-left: em(4px, 12px) solid transparent;
   border-right: em(4px, 12px) solid transparent;
-  border-top: em(5px, 12px) solid $grey-textLighter; /* text variable is ok, this is icon inline with text */
+  border-top: em(5px, 12px) solid $grey-textLighter;
+  /* text variable is ok, this is icon inline with text */
   display: inline-block;
   margin-left: em(8px, 12px);
   margin-top: em(11px, 12px);
@@ -492,7 +467,8 @@
   .jv-mTable-cell-titletext.jv-isOpen.jv::before {
   border-left: em(4px) solid rgba(0, 0, 0, 0);
   border-right: em(4px) solid rgba(0, 0, 0, 0);
-  border-top: em(5px) solid $color-textDark; /* text variable is ok, this is icon inline with text */
+  border-top: em(5px) solid $color-textDark;
+  /* text variable is ok, this is icon inline with text */
   content: "";
   float: left;
   margin-top: em(7px);
@@ -502,7 +478,8 @@
 .jv-mTableJoins.jv
   .jv-mTable-rowIsland.jv
   .jv-mTable-cell-titletext.jv-isClosed.jv::before {
-  border-left: em(5px) solid $color-textDark; /* text variable is ok, this is icon inline with text */
+  border-left: em(5px) solid $color-textDark;
+  /* text variable is ok, this is icon inline with text */
   border-bottom: em(4px) solid rgba(0, 0, 0, 0);
   border-top: em(4px) solid rgba(0, 0, 0, 0);
   content: "";
@@ -517,7 +494,8 @@
   .jv-mTable-cell-titletext.jv-isOpen.jv::before {
   border-left: em(4px) solid rgba(0, 0, 0, 0);
   border-right: em(4px) solid rgba(0, 0, 0, 0);
-  border-top: em(5px) solid $color-textLight; /* text variable is ok, this is icon inline with text */
+  border-top: em(5px) solid $color-textLight;
+  /* text variable is ok, this is icon inline with text */
   content: "";
   float: left;
   margin-top: em(7px);
@@ -527,7 +505,8 @@
 .jv-mTableJoins.jv
   .jv-mTable-rowTablenames.jv
   .jv-mTable-cell-titletext.jv-isClosed.jv::before {
-  border-left: em(5px) solid $color-textLight; /* text variable is ok, this is icon inline with text */
+  border-left: em(5px) solid $color-textLight;
+  /* text variable is ok, this is icon inline with text */
   border-bottom: em(4px) solid rgba(0, 0, 0, 0);
   border-top: em(4px) solid rgba(0, 0, 0, 0);
   content: "";