diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..1428de9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,39 @@
+name: Bug report
+description: Create a report to help us improve
+title: '[BUG] '
+labels: ['bug']
+assignees: []
+body:
+  - type: input
+    attributes:
+      label: Nsis version
+      description: What Nesis version are you using?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: To reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 0000000..40b946a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's objective.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..310ddec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request.
diff --git a/nesis/frontend/client/src/components/MenuHeader.js b/nesis/frontend/client/src/components/MenuHeader.js
index fd2bb40..51944db 100644
--- a/nesis/frontend/client/src/components/MenuHeader.js
+++ b/nesis/frontend/client/src/components/MenuHeader.js
@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { PersonCircle, QuestionSquare } from 'react-bootstrap-icons';
 import { useCurrentSession, useSignOut } from '../SessionContext';
 import { ReactComponent as Hamburger } from '../images/Hamburger.svg';
-import { ReactComponent as Logo } from '../images/NesisIcon.svg';
+import { ReactComponent as Logo } from '../images/Nesis.svg';
 import styled from 'styled-components/macro';
 import { device } from '../utils/breakpoints';
 import client from '../utils/httpClient';
@@ -28,8 +28,9 @@ const LogoContainer = styled.div`
 
 const LogoFull = styled(Logo)`
   display: block;
-  height: 35px;
-  width: 35px;
+  height: 105px;
+  width: 105px;
+  margin-right: 10px;
 `;
 
 const UserControlsRow = styled.div`
@@ -88,12 +89,17 @@ export default function MenuHeader({ onMobileMenuClick }) {
           <Hamburger />
         </MobileMenuTrigger>
         <LogoContainer>
-          <LogoFull /> Nesis - Enterprise Knowledge
+          <LogoFull />
         </LogoContainer>
         {session && (
           <UserControlsRow>
             <HeaderToolBarIcon>
-              <QuestionSquare size={iconSize} className="help-icon" /> Help
+              <a
+                href="https://github.com/ametnes/nesis/blob/main/docs/README.md"
+                target="_blank"
+              >
+                <QuestionSquare size={iconSize} className="help-icon" /> Help
+              </a>
             </HeaderToolBarIcon>
             <HeaderToolBarIcon>
               <PersonCircle size={iconSize} className="account-icon" />
diff --git a/nesis/frontend/client/src/components/Table.js b/nesis/frontend/client/src/components/Table.js
index 088150a..ff47e2d 100644
--- a/nesis/frontend/client/src/components/Table.js
+++ b/nesis/frontend/client/src/components/Table.js
@@ -46,7 +46,8 @@ const DeleteButtonContainer = styled.button`
   background: none;
   border: none;
   cursor: pointer;
-  margin-left: 16px;
+  margin-left: 8px;
+  margin-right: 8px;
 
   fill: ${(props) => props.theme.danger2};
 
diff --git a/nesis/frontend/client/src/components/inputs/SquareButton.js b/nesis/frontend/client/src/components/inputs/SquareButton.js
index be3cb77..d184826 100644
--- a/nesis/frontend/client/src/components/inputs/SquareButton.js
+++ b/nesis/frontend/client/src/components/inputs/SquareButton.js
@@ -78,6 +78,8 @@ export const OutlinedSquareButton = styled(SquareButton)`
 
 export const EditOutlinedSquareButton = styled(OutlinedSquareButton)`
   min-width: 50px;
+  margin-left: 8px;
+  margin-right: 8px;
 `;
 
 export default SquareButton;
diff --git a/nesis/frontend/client/src/pages/Settings/Roles/RoleDetailPage.js b/nesis/frontend/client/src/pages/Settings/Roles/RoleDetailPage.js
index 525a676..504bbd0 100644
--- a/nesis/frontend/client/src/pages/Settings/Roles/RoleDetailPage.js
+++ b/nesis/frontend/client/src/pages/Settings/Roles/RoleDetailPage.js
@@ -101,7 +101,7 @@ function DocumentForm({
   initialValues = {
     id: role?.id,
     name: role?.name,
-    policy: JSON.stringify(role?.policy || '', null, 4),
+    policy: JSON.stringify(role?.policy || 'Enter value json here', null, 4),
   },
 }) {
   const history = useHistory();
diff --git a/nesis/frontend/client/src/pages/Settings/Roles/RolesPage.js b/nesis/frontend/client/src/pages/Settings/Roles/RolesPage.js
index d1b3300..04936cf 100644
--- a/nesis/frontend/client/src/pages/Settings/Roles/RolesPage.js
+++ b/nesis/frontend/client/src/pages/Settings/Roles/RolesPage.js
@@ -276,27 +276,27 @@ const DocumentsGPTPage = () => {
                     </td>
                   </tr>
                 )}
-                {paginatedDocuments.map((Roles) => (
-                  <tr key={Roles.id}>
-                    <td>{Roles.name}</td>
-                    <td>{Roles?.create_date}</td>
+                {paginatedDocuments.map((role) => (
+                  <tr key={role.id}>
+                    <td>{role.name}</td>
+                    <td>{role?.create_date}</td>
                     <td style={{ display: 'flex' }}>
-                      <DeleteItemButton
-                        onClick={() => {
-                          setCurrentItem(Roles.id);
-                          showConfirmModal();
-                        }}
-                      />
                       <EditOutlinedSquareButton
                         onClick={() =>
                           history.push({
-                            pathname: `/settings/roles/${Roles.id}/edit`,
-                            state: Roles,
+                            pathname: `/settings/roles/${role.id}/edit`,
+                            state: role,
                           })
                         }
                       >
                         Edit
                       </EditOutlinedSquareButton>
+                      <DeleteItemButton
+                        onClick={() => {
+                          setCurrentItem(role.id);
+                          showConfirmModal();
+                        }}
+                      />
                     </td>
                   </tr>
                 ))}
diff --git a/nesis/frontend/client/src/pages/Settings/Users/UsersPage.js b/nesis/frontend/client/src/pages/Settings/Users/UsersPage.js
index 70e2b2e..2ec684b 100644
--- a/nesis/frontend/client/src/pages/Settings/Users/UsersPage.js
+++ b/nesis/frontend/client/src/pages/Settings/Users/UsersPage.js
@@ -292,28 +292,28 @@ const DocumentsGPTPage = () => {
                     </td>
                   </tr>
                 )}
-                {paginatedDocuments.map((Documents) => (
-                  <tr key={Documents.id}>
-                    <td>{Documents.name}</td>
-                    <td>{Documents.email}</td>
-                    <td>{Documents.enabled ? 'True' : 'False'}</td>
-                    <td style={{ display: 'flex' }}>
-                      <DeleteItemButton
-                        onClick={() => {
-                          setCurrentItem(Documents.id);
-                          showConfirmModal();
-                        }}
-                      />
+                {paginatedDocuments.map((user) => (
+                  <tr key={user.id}>
+                    <td>{user.name}</td>
+                    <td>{user.email}</td>
+                    <td>{user.enabled ? 'True' : 'False'}</td>
+                    <td style={{ display: 'flex', padding: '5px' }}>
                       <EditOutlinedSquareButton
                         onClick={() =>
                           history.push({
-                            pathname: `/settings/users/${Documents.id}/edit`,
-                            state: Documents,
+                            pathname: `/settings/users/${user.id}/edit`,
+                            state: user,
                           })
                         }
                       >
                         Edit
                       </EditOutlinedSquareButton>
+                      <DeleteItemButton
+                        onClick={() => {
+                          setCurrentItem(user.id);
+                          showConfirmModal();
+                        }}
+                      />
                     </td>
                   </tr>
                 ))}