diff --git a/src/Journal/index.tsx b/src/Journal/index.tsx
index 73f9cc2..d0aeb1f 100644
--- a/src/Journal/index.tsx
+++ b/src/Journal/index.tsx
@@ -1,5 +1,7 @@
 import * as React from 'react';
-import { Tabs, Tab } from 'material-ui/Tabs';
+import Tab from '@material-ui/core/Tab';
+import Tabs from '@material-ui/core/Tabs';
+import { Theme, withTheme } from '@material-ui/core/styles';
 
 import SearchableAddressBook from '../components/SearchableAddressBook';
 import Contact from '../components/Contact';
@@ -27,24 +29,29 @@ interface PropsType {
 }
 
 interface PropsTypeInner extends PropsType {
+  theme: Theme;
 }
 
 const JournalAddressBook = journalView(SearchableAddressBook, Contact);
 const PersistCalendar = historyPersistor('Calendar')(Calendar);
 const JournalCalendar = journalView(PersistCalendar, Event);
 
-class Journal extends React.PureComponent {
-  static defaultProps = {
-    prevUid: null,
+class Journal extends React.PureComponent<PropsTypeInner> {
+  state: {
+    tab: number,
   };
 
-  props: PropsTypeInner;
-
-  constructor(props: any) {
+  constructor(props: PropsTypeInner) {
     super(props);
+
+    this.state = {
+      tab: 0,
+    };
   }
 
   render() {
+    const { theme } = this.props;
+    const currentTab = this.state.tab;
     const journalUid = this.props.match.params.journalUid;
 
     const syncJournal = this.props.syncInfo.get(journalUid);
@@ -74,25 +81,28 @@ class Journal extends React.PureComponent {
     return (
       <React.Fragment>
         <SecondaryHeader text={collectionInfo.displayName} />
-        <Tabs>
-          <Tab
-            label={itemsTitle}
-          >
-            <Container>
-              {itemsView}
-            </Container>
-          </Tab>
-          <Tab
-            label="Journal Entries"
-          >
-            <Container>
-              <JournalEntries journal={journal} entries={syncEntries} />
-            </Container>
-          </Tab>
+        <Tabs
+          fullWidth={true}
+          style={{ backgroundColor: theme.palette.primary.main, color: 'white' }}
+          value={currentTab}
+          onChange={(event, tab) => this.setState({ tab })}
+        >
+          <Tab label={itemsTitle} />
+          <Tab label="Journal Entries" />
         </Tabs>
+        { currentTab === 0 &&
+          <Container>
+            {itemsView}
+          </Container>
+        }
+        { currentTab === 1 &&
+          <Container>
+            <JournalEntries journal={journal} entries={syncEntries} />
+          </Container>
+        }
       </React.Fragment>
     );
   }
 }
 
-export default Journal;
+export default withTheme()(Journal);
diff --git a/src/SyncGate.tsx b/src/SyncGate.tsx
index 948aa3c..fc57efb 100644
--- a/src/SyncGate.tsx
+++ b/src/SyncGate.tsx
@@ -89,7 +89,6 @@ const syncInfoSelector = createSelector(
 );
 
 const PimRouter = withRouter(Pim);
-const JournalRouter = withRouter(Journal);
 
 class SyncGate extends React.PureComponent<PropsTypeInner> {
   constructor(props: PropsTypeInner) {
@@ -198,7 +197,7 @@ class SyncGate extends React.PureComponent<PropsTypeInner> {
         <Route
           path={routeResolver.getRoute('journals._id')}
           render={({match}) => (
-            <JournalRouter
+            <Journal
               syncInfo={journalMap}
               match={match}
             />