diff --git a/app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx b/app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx
index abf1e609b7f..e298911ee0f 100644
--- a/app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx
+++ b/app/src/atoms/SoftwareKeyboard/CustomKeyboard/CustomKeyboard.stories.tsx
@@ -8,7 +8,8 @@ import {
 import { touchScreenViewport } from '../../../DesignTokens/constants'
 import { InputField } from '../../InputField'
 import { CustomKeyboard } from './'
-import '../../../styles.global.module.css'
+import '../index.css'
+import './index.css'
 
 import type { Story, Meta } from '@storybook/react'
 
diff --git a/app/src/atoms/SoftwareKeyboard/CustomKeyboard/index.module.css b/app/src/atoms/SoftwareKeyboard/CustomKeyboard/index.css
similarity index 100%
rename from app/src/atoms/SoftwareKeyboard/CustomKeyboard/index.module.css
rename to app/src/atoms/SoftwareKeyboard/CustomKeyboard/index.css
diff --git a/app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx b/app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx
index 8cb8ab63acd..c245ca23be9 100644
--- a/app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx
+++ b/app/src/atoms/SoftwareKeyboard/NormalKeyboard/NormalKeyboard.stories.tsx
@@ -8,7 +8,9 @@ import {
 import { touchScreenViewport } from '../../../DesignTokens/constants'
 import { InputField } from '../../InputField'
 import { NormalKeyboard } from '.'
-import '../../../styles.global.module.css'
+
+import '../index.css'
+import './index.css'
 
 import type { Story, Meta } from '@storybook/react'
 
diff --git a/app/src/atoms/SoftwareKeyboard/NormalKeyboard/index.module.css b/app/src/atoms/SoftwareKeyboard/NormalKeyboard/index.css
similarity index 100%
rename from app/src/atoms/SoftwareKeyboard/NormalKeyboard/index.module.css
rename to app/src/atoms/SoftwareKeyboard/NormalKeyboard/index.css
diff --git a/app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx b/app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx
index 797c89d17b8..f87ca54481b 100644
--- a/app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx
+++ b/app/src/atoms/SoftwareKeyboard/Numpad/Numpad.stories.tsx
@@ -8,7 +8,8 @@ import {
 import { touchScreenViewport } from '../../../DesignTokens/constants'
 import { InputField } from '../../InputField'
 import { Numpad } from './'
-import '../../../styles.global.module.css'
+import '../index.css'
+import './index.css'
 
 import type { Story, Meta } from '@storybook/react'
 
diff --git a/app/src/atoms/SoftwareKeyboard/Numpad/index.module.css b/app/src/atoms/SoftwareKeyboard/Numpad/index.css
similarity index 100%
rename from app/src/atoms/SoftwareKeyboard/Numpad/index.module.css
rename to app/src/atoms/SoftwareKeyboard/Numpad/index.css
diff --git a/app/src/atoms/SoftwareKeyboard/index.css b/app/src/atoms/SoftwareKeyboard/index.css
new file mode 100644
index 00000000000..f3db7ebb6c1
--- /dev/null
+++ b/app/src/atoms/SoftwareKeyboard/index.css
@@ -0,0 +1 @@
+.hg-theme-default{background-color:#ececec;border-radius:5px;box-sizing:border-box;font-family:HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif;overflow:hidden;padding:5px;touch-action:manipulation;-webkit-user-select:none;-moz-user-select:none;user-select:none;width:100%}.hg-theme-default .hg-button span{pointer-events:none}.hg-theme-default button.hg-button{border-width:0;font-size:inherit;outline:0}.hg-theme-default .hg-button{display:inline-block;flex-grow:1}.hg-theme-default .hg-row{display:flex}.hg-theme-default .hg-row:not(:last-child){margin-bottom:5px}.hg-theme-default .hg-row .hg-button-container,.hg-theme-default .hg-row .hg-button:not(:last-child){margin-right:5px}.hg-theme-default .hg-row>div:last-child{margin-right:0}.hg-theme-default .hg-row .hg-button-container{display:flex}.hg-theme-default .hg-button{align-items:center;background:#fff;border-bottom:1px solid #b5b5b5;border-radius:5px;box-shadow:0 0 3px -1px rgba(0,0,0,.3);box-sizing:border-box;cursor:pointer;display:flex;height:40px;justify-content:center;padding:5px;-webkit-tap-highlight-color:rgba(0,0,0,0)}.hg-theme-default .hg-button.hg-standardBtn{width:20px}.hg-theme-default .hg-button.hg-activeButton{background:#efefef}.hg-theme-default.hg-layout-numeric .hg-button{align-items:center;display:flex;height:60px;justify-content:center;width:33.3%}.hg-theme-default .hg-button.hg-button-numpadadd,.hg-theme-default .hg-button.hg-button-numpadenter{height:85px}.hg-theme-default .hg-button.hg-button-numpad0{width:105px}.hg-theme-default .hg-button.hg-button-com{max-width:85px}.hg-theme-default .hg-button.hg-standardBtn.hg-button-at{max-width:45px}.hg-theme-default .hg-button.hg-selectedButton{background:rgba(5,25,70,.53);color:#fff}.hg-theme-default .hg-button.hg-standardBtn[data-skbtn=".com"]{max-width:82px}.hg-theme-default .hg-button.hg-standardBtn[data-skbtn="@"]{max-width:60px}.hg-candidate-box{background:#ececec;border-bottom:2px solid #b5b5b5;border-radius:5px;display:inline-flex;margin-top:-10px;max-width:272px;position:absolute;transform:translateY(-100%);-webkit-user-select:none;-moz-user-select:none;user-select:none}ul.hg-candidate-box-list{display:flex;flex:1;list-style:none;margin:0;padding:0}li.hg-candidate-box-list-item{align-items:center;display:flex;height:40px;justify-content:center;width:40px}li.hg-candidate-box-list-item:hover{background:rgba(0,0,0,.03);cursor:pointer}li.hg-candidate-box-list-item:active{background:rgba(0,0,0,.1)}.hg-candidate-box-prev:before{content:"◄"}.hg-candidate-box-next:before{content:"►"}.hg-candidate-box-next,.hg-candidate-box-prev{align-items:center;color:#969696;cursor:pointer;display:flex;padding:0 10px}.hg-candidate-box-next{border-bottom-right-radius:5px;border-top-right-radius:5px}.hg-candidate-box-prev{border-bottom-left-radius:5px;border-top-left-radius:5px}.hg-candidate-box-btn-active{color:#444}
\ No newline at end of file
diff --git a/app/src/index.tsx b/app/src/index.tsx
index b130bd3e39f..123cfcc26fd 100644
--- a/app/src/index.tsx
+++ b/app/src/index.tsx
@@ -15,7 +15,10 @@ import { uiInitialized } from './redux/shell'
 import { history } from './redux/reducer'
 import { store } from './redux/store'
 
-import './styles.global.module.css'
+import '../src/atoms/SoftwareKeyboard/index.css'
+import '../src/atoms/SoftwareKeyboard/CustomKeyboard/index.css'
+import '../src/atoms/SoftwareKeyboard/NormalKeyboard/index.css'
+import '../src/atoms/SoftwareKeyboard/Numpad/index.css'
 
 // component tree
 import { App } from './App'
diff --git a/app/src/organisms/RunTimeControl/utils.ts b/app/src/organisms/RunTimeControl/utils.ts
index 2cacd956483..91cfee88a4b 100644
--- a/app/src/organisms/RunTimeControl/utils.ts
+++ b/app/src/organisms/RunTimeControl/utils.ts
@@ -26,8 +26,6 @@ export function formatDuration(duration: Duration): string {
  * @returns string in format hh:mm:ss, e.g. 03:15:45
  */
 export function formatInterval(start: string, end: string): string {
-  console.log(start)
-  console.log(new Date(start))
   const duration = intervalToDuration({
     start: new Date(start),
     end: new Date(end),
diff --git a/app/src/styles.global.module.css b/app/src/styles.global.module.css
index 1b0c6ffd32b..9cdcb703387 100644
--- a/app/src/styles.global.module.css
+++ b/app/src/styles.global.module.css
@@ -3,6 +3,6 @@
 */
 
 @import '../../node_modules/react-simple-keyboard/build/css/index.css';
-@import './atoms/SoftwareKeyboard/CustomKeyboard/index.module.css';
-@import './atoms/SoftwareKeyboard/NormalKeyboard/index.module.css';
-@import './atoms/SoftwareKeyboard/Numpad/index.module.css';
+@import './atoms/SoftwareKeyboard/CustomKeyboard/index.css';
+@import './atoms/SoftwareKeyboard/NormalKeyboard/index.css';
+@import './atoms/SoftwareKeyboard/Numpad/index.css';