diff --git a/client/package-lock.json b/client/package-lock.json
index e31b6023..5205d81a 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -4197,9 +4197,9 @@
       }
     },
     "date-fns": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.4.1.tgz",
-      "integrity": "sha512-2RhmH/sjDSCYW2F3ZQxOUx/I7PvzXpi89aQL2d3OAxSTwLx6NilATeUbe0menFE3Lu5lFkOFci36ivimwYHHxw=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.5.0.tgz",
+      "integrity": "sha512-I6Tkis01//nRcmvMQw/MRE1HAtcuA5Ie6jGPb8bJZJub7494LGOObqkV3ParnsSVviAjk5C8mNKDqYVBzCopWg=="
     },
     "date-now": {
       "version": "0.1.4",
diff --git a/client/package.json b/client/package.json
index de5cfc51..12af50a9 100755
--- a/client/package.json
+++ b/client/package.json
@@ -34,7 +34,7 @@
     "axios": "^0.19.0",
     "classnames": "^2.2.6",
     "connected-react-router": "^6.5.2",
-    "date-fns": "^2.4.1",
+    "date-fns": "^2.5.0",
     "dequal": "^1.0.0",
     "history": "^4.10.1",
     "i18next": "^17.2.0",
diff --git a/client/src/components/Boards/EditPopup.jsx b/client/src/components/Boards/EditPopup.jsx
index d471a7c4..008e8f40 100755
--- a/client/src/components/Boards/EditPopup.jsx
+++ b/client/src/components/Boards/EditPopup.jsx
@@ -78,6 +78,7 @@ const EditStep = React.memo(({
       </Popup.Header>
       <Popup.Content>
         <Form onSubmit={handleSubmit}>
+          <div className={styles.text}>{t('common.title')}</div>
           <Input
             fluid
             ref={nameField}
diff --git a/client/src/components/Boards/EditPopup.module.css b/client/src/components/Boards/EditPopup.module.css
index 3f177b91..f2d73301 100644
--- a/client/src/components/Boards/EditPopup.module.css
+++ b/client/src/components/Boards/EditPopup.module.css
@@ -8,3 +8,10 @@
 .field {
   margin-bottom: 8px;
 }
+
+.text {
+  color: #444444;
+  font-size: 12px;
+  font-weight: bold;
+  padding-bottom: 6px;
+}
diff --git a/client/src/components/CardModal/CardModal.jsx b/client/src/components/CardModal/CardModal.jsx
index 532bf8fb..c4c45715 100755
--- a/client/src/components/CardModal/CardModal.jsx
+++ b/client/src/components/CardModal/CardModal.jsx
@@ -105,13 +105,7 @@ const CardModal = React.memo(
     const labelIds = labels.map((label) => label.id);
 
     return (
-      <Modal
-        open
-        closeIcon
-        size="small"
-        centered={false}
-        onClose={onClose}
-      >
+      <Modal open closeIcon size="small" centered={false} onClose={onClose}>
         <Grid className={styles.grid}>
           <Grid.Row className={styles.headerPadding}>
             <Grid.Column width={16} className={styles.headerPadding}>
diff --git a/client/src/components/Header/Header.jsx b/client/src/components/Header/Header.jsx
index b4e9970d..6a1cfa10 100755
--- a/client/src/components/Header/Header.jsx
+++ b/client/src/components/Header/Header.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { Icon, Menu } from 'semantic-ui-react';
 
@@ -20,46 +19,40 @@ const Header = React.memo(
     onNotificationDelete,
     onUsers,
     onLogout,
-  }) => {
-    const [t] = useTranslation();
-
-    return (
-      <div className={styles.wrapper}>
-        <Link to={Paths.ROOT} className={styles.logo}>
-          Planka
-        </Link>
-        <Menu inverted size="large" className={styles.menu}>
+  }) => (
+    <div className={styles.wrapper}>
+      <Link to={Paths.ROOT} className={styles.logo}>
+        Planka
+      </Link>
+      <Menu inverted size="large" className={styles.menu}>
+        <Menu.Menu position="right">
           {isEditable && (
             <Menu.Item className={styles.item} onClick={onUsers}>
-              {t('common.users', {
-                context: 'title',
-              })}
+              <Icon fitted name="users" />
             </Menu.Item>
           )}
-          <Menu.Menu position="right">
-            <NotificationsPopup items={notifications} onDelete={onNotificationDelete}>
-              <Menu.Item className={styles.item}>
-                <Icon name="bell" className={styles.icon} />
-                {notifications.length > 0 && (
-                  <span className={styles.notification}>{notifications.length}</span>
-                )}
-              </Menu.Item>
-            </NotificationsPopup>
-            <UserPopup
-              name={user.name}
-              avatar={user.avatar}
-              isAvatarUploading={user.isAvatarUploading}
-              onUpdate={onUserUpdate}
-              onAvatarUpload={onUserAvatarUpload}
-              onLogout={onLogout}
-            >
-              <Menu.Item className={styles.item}>{user.name}</Menu.Item>
-            </UserPopup>
-          </Menu.Menu>
-        </Menu>
-      </div>
-    );
-  },
+          <NotificationsPopup items={notifications} onDelete={onNotificationDelete}>
+            <Menu.Item className={styles.item}>
+              <Icon fitted name="bell" />
+              {notifications.length > 0 && (
+                <span className={styles.notification}>{notifications.length}</span>
+              )}
+            </Menu.Item>
+          </NotificationsPopup>
+          <UserPopup
+            name={user.name}
+            avatar={user.avatar}
+            isAvatarUploading={user.isAvatarUploading}
+            onUpdate={onUserUpdate}
+            onAvatarUpload={onUserAvatarUpload}
+            onLogout={onLogout}
+          >
+            <Menu.Item className={styles.item}>{user.name}</Menu.Item>
+          </UserPopup>
+        </Menu.Menu>
+      </Menu>
+    </div>
+  ),
 );
 
 Header.propTypes = {
diff --git a/client/src/components/Header/Header.module.css b/client/src/components/Header/Header.module.css
index 826657e1..958bd95e 100644
--- a/client/src/components/Header/Header.module.css
+++ b/client/src/components/Header/Header.module.css
@@ -1,7 +1,3 @@
-.icon {
-  margin: 0 !important;
-}
-
 .item:before {
   background: none !important;
 }
diff --git a/client/src/components/Header/UserPopup/EditNameStep.jsx b/client/src/components/Header/UserPopup/EditNameStep.jsx
index 02c3b7b6..2909897a 100755
--- a/client/src/components/Header/UserPopup/EditNameStep.jsx
+++ b/client/src/components/Header/UserPopup/EditNameStep.jsx
@@ -44,6 +44,7 @@ const EditNameStep = React.memo(({
       </Popup.Header>
       <Popup.Content>
         <Form onSubmit={handleSubmit}>
+          <div className={styles.text}>{t('common.name')}</div>
           <Input
             fluid
             ref={field}
diff --git a/client/src/components/Header/UserPopup/EditNameStep.module.css b/client/src/components/Header/UserPopup/EditNameStep.module.css
index f04df47d..72114a1d 100644
--- a/client/src/components/Header/UserPopup/EditNameStep.module.css
+++ b/client/src/components/Header/UserPopup/EditNameStep.module.css
@@ -1,3 +1,10 @@
 .field {
   margin-bottom: 8px;
 }
+
+.text {
+  color: #444444;
+  font-size: 12px;
+  font-weight: bold;
+  padding-bottom: 6px;
+}
diff --git a/client/src/components/Project/EditPopup.jsx b/client/src/components/Project/EditPopup.jsx
index b3a93bde..229e3b84 100755
--- a/client/src/components/Project/EditPopup.jsx
+++ b/client/src/components/Project/EditPopup.jsx
@@ -78,6 +78,7 @@ const EditStep = React.memo(({
       </Popup.Header>
       <Popup.Content>
         <Form onSubmit={handleSubmit}>
+          <div className={styles.text}>{t('common.title')}</div>
           <Input
             fluid
             ref={nameField}
diff --git a/client/src/components/Project/EditPopup.module.css b/client/src/components/Project/EditPopup.module.css
index 3f177b91..f2d73301 100644
--- a/client/src/components/Project/EditPopup.module.css
+++ b/client/src/components/Project/EditPopup.module.css
@@ -8,3 +8,10 @@
 .field {
   margin-bottom: 8px;
 }
+
+.text {
+  color: #444444;
+  font-size: 12px;
+  font-weight: bold;
+  padding-bottom: 6px;
+}
diff --git a/client/src/components/Project/Project.jsx b/client/src/components/Project/Project.jsx
index fa63d66c..e82d8f21 100755
--- a/client/src/components/Project/Project.jsx
+++ b/client/src/components/Project/Project.jsx
@@ -33,15 +33,19 @@ const Project = React.memo(
         <Grid className={styles.header}>
           <Grid.Row>
             <Grid.Column>
-              <EditPopup
-                defaultData={{
-                  name,
-                }}
-                onUpdate={onUpdate}
-                onDelete={onDelete}
-              >
-                <Button content={name} disabled={!isEditable} className={styles.name} />
-              </EditPopup>
+              {isEditable ? (
+                <EditPopup
+                  defaultData={{
+                    name,
+                  }}
+                  onUpdate={onUpdate}
+                  onDelete={onDelete}
+                >
+                  <Button content={name} disabled={!isEditable} className={styles.name} />
+                </EditPopup>
+              ) : (
+                <span className={styles.name}>{name}</span>
+              )}
               <span className={styles.users}>
                 {memberships.map((membership) => (
                   <span key={membership.id} className={styles.user}>
diff --git a/client/src/components/Project/Project.module.css b/client/src/components/Project/Project.module.css
index 5f1570e4..753ae560 100644
--- a/client/src/components/Project/Project.module.css
+++ b/client/src/components/Project/Project.module.css
@@ -22,9 +22,11 @@
 .name {
   background: transparent !important;
   color: #fff !important;
+  display: inline-block !important;
   font-size: 32px !important;
   font-weight: bold !important;
   line-height: 36px !important;
+  margin-right: 8px !important;
   padding: 0 !important;
 }
 
diff --git a/client/src/components/UsersModal/UsersModal.jsx b/client/src/components/UsersModal/UsersModal.jsx
index 8f7d7527..e7b2e2b7 100755
--- a/client/src/components/UsersModal/UsersModal.jsx
+++ b/client/src/components/UsersModal/UsersModal.jsx
@@ -2,14 +2,12 @@ import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import {
-  Button, Header, Modal, Table,
+  Button, Modal, Table,
 } from 'semantic-ui-react';
 
 import AddUserPopupContainer from '../../containers/AddUserPopupContainer';
 import Item from './Item';
 
-import styles from './UsersModal.module.css';
-
 const UsersModal = React.memo(({
   items, onUpdate, onDelete, onClose,
 }) => {
@@ -30,13 +28,13 @@ const UsersModal = React.memo(({
   );
 
   return (
-    <Modal open closeIcon size="large" onClose={onClose}>
+    <Modal open closeIcon size="large" centered={false} onClose={onClose}>
+      <Modal.Header>
+        {t('common.users', {
+          context: 'title',
+        })}
+      </Modal.Header>
       <Modal.Content>
-        <Header size="huge" className={styles.title}>
-          {t('common.users', {
-            context: 'title',
-          })}
-        </Header>
         <Table basic="very">
           <Table.Header>
             <Table.Row>
@@ -58,17 +56,13 @@ const UsersModal = React.memo(({
               />
             ))}
           </Table.Body>
-          <Table.Footer>
-            <Table.Row>
-              <Table.HeaderCell colSpan="4">
-                <AddUserPopupContainer>
-                  <Button positive content={t('action.addUser')} className={styles.button} />
-                </AddUserPopupContainer>
-              </Table.HeaderCell>
-            </Table.Row>
-          </Table.Footer>
         </Table>
       </Modal.Content>
+      <Modal.Actions>
+        <AddUserPopupContainer>
+          <Button positive content={t('action.addUser')} />
+        </AddUserPopupContainer>
+      </Modal.Actions>
     </Modal>
   );
 });
diff --git a/client/src/components/UsersModal/UsersModal.module.css b/client/src/components/UsersModal/UsersModal.module.css
deleted file mode 100644
index f6844032..00000000
--- a/client/src/components/UsersModal/UsersModal.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.button {
-  float: right;
-  height: 32px;
-  line-height: 20px;
-  margin-top: -2px;
-  padding: 6px 12px;
-}
-
-.title {
-  display: inline-block;
-}
diff --git a/server/package-lock.json b/server/package-lock.json
index 0702f5ff..ac1c3a2f 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1186,9 +1186,9 @@
       }
     },
     "dotenv": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz",
-      "integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA=="
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
     },
     "dotenv-cli": {
       "version": "3.0.0",
@@ -4125,18 +4125,18 @@
       }
     },
     "nodemon": {
-      "version": "1.19.3",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.3.tgz",
-      "integrity": "sha512-TBNKRmJykEbxpTniZBusqRrUTHIEqa2fpecbTQDQj1Gxjth7kKAPP296ztR0o5gPUWsiYbuEbt73/+XMYab1+w==",
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz",
+      "integrity": "sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.1.5",
-        "debug": "^3.1.0",
+        "chokidar": "^2.1.8",
+        "debug": "^3.2.6",
         "ignore-by-default": "^1.0.1",
         "minimatch": "^3.0.4",
-        "pstree.remy": "^1.1.6",
-        "semver": "^5.5.0",
-        "supports-color": "^5.2.0",
+        "pstree.remy": "^1.1.7",
+        "semver": "^5.7.1",
+        "supports-color": "^5.5.0",
         "touch": "^3.1.0",
         "undefsafe": "^2.0.2",
         "update-notifier": "^2.5.0"
diff --git a/server/package.json b/server/package.json
index f930ca03..e27b8cbe 100644
--- a/server/package.json
+++ b/server/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "bcrypt": "^3.0.6",
-    "dotenv": "^8.1.0",
+    "dotenv": "^8.2.0",
     "dotenv-cli": "^3.0.0",
     "jsonwebtoken": "^8.5.1",
     "knex": "^0.19.5",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "eslint": "5.16.0",
-    "nodemon": "^1.19.3"
+    "nodemon": "^1.19.4"
   },
   "engines": {
     "node": "^12.10"