diff --git a/src/Calendars/Main.tsx b/src/Calendars/Main.tsx
index 280c3ede..e2613301 100644
--- a/src/Calendars/Main.tsx
+++ b/src/Calendars/Main.tsx
@@ -6,10 +6,11 @@ import { Switch, Route, useHistory } from "react-router";
 
 import * as Etebase from "etebase";
 
-import { Button, useTheme } from "@material-ui/core";
+import { Button, IconButton, useTheme } from "@material-ui/core";
 import IconEdit from "@material-ui/icons/Edit";
 import IconDuplicate from "@material-ui/icons/FileCopy";
 import IconChangeHistory from "@material-ui/icons/ChangeHistory";
+import ArrowBack from "@material-ui/icons/ArrowBack";
 
 import { EventType, PimType } from "../pim-types";
 import { useCredentials } from "../credentials";
@@ -198,44 +199,56 @@ export default function CalendarsMain() {
                 path={routeResolver.getRoute("pim.events._id")}
                 exact
               >
-                <div style={{ textAlign: "right", marginBottom: 15 }}>
-                  <Button
-                    variant="contained"
-                    style={styles.button}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute("pim.events._id.log", { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconChangeHistory style={styles.leftIcon} />
-                    Change History
-                  </Button>
-
-                  <Button
-                    color="secondary"
-                    variant="contained"
-                    disabled={readOnly}
-                    style={{ ...styles.button, marginLeft: 15 }}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute("pim.events._id.edit", { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconEdit style={styles.leftIcon} />
-                    Edit
-                  </Button>
-
-                  <Button
-                    color="secondary"
-                    variant="contained"
-                    disabled={readOnly}
-                    style={{ ...styles.button, marginLeft: 15 }}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute("pim.events._id.duplicate", { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconDuplicate style={styles.leftIcon} />
-                    Duplicate
-                  </Button>
+                <div style={{ marginBottom: 15, display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+                  <div>
+                    <IconButton
+                      size="small"
+                      onClick={() => 
+                        history.push(routeResolver.getRoute(`pim.events`))
+                      }
+                    >
+                      <ArrowBack />
+                    </IconButton>
+                  </div>
+                  <div>
+                    <Button
+                      variant="contained"
+                      style={styles.button}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute("pim.events._id.log", { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconChangeHistory style={styles.leftIcon} />
+                      Change History
+                    </Button>
 
+                    <Button
+                      color="secondary"
+                      variant="contained"
+                      disabled={readOnly}
+                      style={{ ...styles.button, marginLeft: 15 }}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute("pim.events._id.edit", { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconEdit style={styles.leftIcon} />
+                      Edit
+                    </Button>
+
+                    <Button
+                      color="secondary"
+                      variant="contained"
+                      disabled={readOnly}
+                      style={{ ...styles.button, marginLeft: 15 }}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute("pim.events._id.duplicate", { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconDuplicate style={styles.leftIcon} />
+                      Duplicate
+                    </Button>
+
+                  </div>
                 </div>
                 <Event item={item} />
               </Route>
diff --git a/src/Contacts/Main.tsx b/src/Contacts/Main.tsx
index 478bf022..c5c94435 100644
--- a/src/Contacts/Main.tsx
+++ b/src/Contacts/Main.tsx
@@ -6,8 +6,9 @@ import { Switch, Route, useHistory } from "react-router";
 
 import * as Etebase from "etebase";
 
-import { Button, useTheme } from "@material-ui/core";
+import { Button, IconButton, useTheme } from "@material-ui/core";
 import IconEdit from "@material-ui/icons/Edit";
+import ArrowBack from "@material-ui/icons/ArrowBack";
 import IconChangeHistory from "@material-ui/icons/ChangeHistory";
 
 import { ContactType, PimType } from "../pim-types";
@@ -202,31 +203,43 @@ export default function ContactsMain() {
                 path={routeResolver.getRoute("pim.contacts._id")}
                 exact
               >
-                <div style={{ textAlign: "right", marginBottom: 15 }}>
-                  <Button
-                    variant="contained"
-                    style={styles.button}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute("pim.contacts._id.log", { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconChangeHistory style={styles.leftIcon} />
-                    Change History
-                  </Button>
-
-                  <Button
-                    color="secondary"
-                    variant="contained"
-                    disabled={readOnly}
-                    style={{ ...styles.button, marginLeft: 15 }}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute(path, { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconEdit style={styles.leftIcon} />
-                    Edit
-                  </Button>
-
+                <div style={{ marginBottom: 15, display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+                  <div>
+                    <IconButton
+                      size="small"
+                      onClick={() => 
+                        history.push(routeResolver.getRoute(`pim.contacts`))
+                      }
+                    >
+                      <ArrowBack />
+                    </IconButton>
+                  </div>
+                  <div>
+                    <Button
+                      variant="contained"
+                      style={styles.button}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute("pim.contacts._id.log", { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconChangeHistory style={styles.leftIcon} />
+                      Change History
+                    </Button>
+
+                    <Button
+                      color="secondary"
+                      variant="contained"
+                      disabled={readOnly}
+                      style={{ ...styles.button, marginLeft: 15 }}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute(path, { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconEdit style={styles.leftIcon} />
+                      Edit
+                    </Button>
+
+                  </div>
                 </div>
                 <Contact item={item} />
               </Route>
diff --git a/src/Tasks/Main.tsx b/src/Tasks/Main.tsx
index e8d973eb..3de4a299 100644
--- a/src/Tasks/Main.tsx
+++ b/src/Tasks/Main.tsx
@@ -6,9 +6,10 @@ import { Switch, Route, useHistory } from "react-router";
 
 import * as Etebase from "etebase";
 
-import { Button, useTheme } from "@material-ui/core";
+import { Button, IconButton, useTheme } from "@material-ui/core";
 import IconEdit from "@material-ui/icons/Edit";
 import IconChangeHistory from "@material-ui/icons/ChangeHistory";
+import ArrowBack from "@material-ui/icons/ArrowBack";
 
 import { TaskType, PimType } from "../pim-types";
 import { useCredentials } from "../credentials";
@@ -168,31 +169,42 @@ export default function TasksMain() {
                 path={routeResolver.getRoute("pim.tasks._id")}
                 exact
               >
-                <div style={{ textAlign: "right", marginBottom: 15 }}>
-                  <Button
-                    variant="contained"
-                    style={styles.button}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute("pim.tasks._id.log", { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconChangeHistory style={styles.leftIcon} />
-                    Change History
-                  </Button>
-
-                  <Button
-                    color="secondary"
-                    variant="contained"
-                    disabled={readOnly}
-                    style={{ ...styles.button, marginLeft: 15 }}
-                    onClick={() =>
-                      history.push(routeResolver.getRoute("pim.tasks._id.edit", { itemUid: getItemNavigationUid(item) }))
-                    }
-                  >
-                    <IconEdit style={styles.leftIcon} />
-                    Edit
-                  </Button>
-
+                <div style={{ marginBottom: 15, display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+                  <div>
+                    <IconButton
+                      size="small"
+                      onClick={() => 
+                        history.push(routeResolver.getRoute(`pim.tasks`))
+                      }
+                    >
+                      <ArrowBack />
+                    </IconButton>
+                  </div>
+                  <div>
+                    <Button
+                      variant="contained"
+                      style={styles.button}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute("pim.tasks._id.log", { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconChangeHistory style={styles.leftIcon} />
+                      Change History
+                    </Button>
+                    
+                    <Button
+                      color="secondary"
+                      variant="contained"
+                      disabled={readOnly}
+                      style={{ ...styles.button, marginLeft: 15 }}
+                      onClick={() =>
+                        history.push(routeResolver.getRoute("pim.tasks._id.edit", { itemUid: getItemNavigationUid(item) }))
+                      }
+                    >
+                      <IconEdit style={styles.leftIcon} />
+                      Edit
+                    </Button>
+                  </div>
                 </div>
                 <Task item={item} />
               </Route>