diff --git a/src/AddressBook.tsx b/src/AddressBook.tsx
index c2f6295..b975042 100644
--- a/src/AddressBook.tsx
+++ b/src/AddressBook.tsx
@@ -63,16 +63,13 @@ class AddressBook extends React.PureComponent {
       return (
         <ListItem
           key={uid}
-          onClick={(e: any) => {
-            e.preventDefault();
-            this.props.onItemClick(entry);
-          }}
-        >
-        <Avatar style={{backgroundColor: getContactColor(entry)}}>
-          {name[0].toUpperCase()}
-        </Avatar>
-        {name}
-        </ListItem>
+          leftIcon={
+            <Avatar style={{backgroundColor: getContactColor(entry)}}>
+              {name[0].toUpperCase()}
+            </Avatar>}
+          primaryText={name}
+          onClick={(e: any) => this.props.onItemClick(entry)}
+        />
       );
     });
 
diff --git a/src/Avatar.tsx b/src/Avatar.tsx
index f42612f..bec1d2c 100644
--- a/src/Avatar.tsx
+++ b/src/Avatar.tsx
@@ -15,7 +15,6 @@ export const Avatar = pure((props: { children: React.ReactNode[] | React.ReactNo
         borderRadius: '50%',
         height: size,
         width: size,
-        marginRight: 15,
         ...props.style,
       }}
     >
diff --git a/src/Contact.tsx b/src/Contact.tsx
index d5de77b..b6fa4b5 100644
--- a/src/Contact.tsx
+++ b/src/Contact.tsx
@@ -1,8 +1,7 @@
 import * as React from 'react';
 import * as moment from 'moment';
 
-import { List, ListItem } from 'material-ui/List';
-import Divider from 'material-ui/Divider';
+import { List, ListItem, ListDivider as Divider } from './List';
 import IconHome from 'material-ui/svg-icons/action/home';
 import IconDate from 'material-ui/svg-icons/action/date-range';
 import CommunicationCall from 'material-ui/svg-icons/communication/call';
@@ -150,6 +149,7 @@ class Contact extends React.PureComponent {
             <span style={{fontSize: '90%'}}>{lastModified}</span>
           )}
         </PimItemHeader>
+        <div style={{padding: 8}} />
         {lists.map((list, idx) => (
           <React.Fragment key={idx}>
             {listIfNotEmpty(list)}
diff --git a/src/JournalEntries.tsx b/src/JournalEntries.tsx
index 1c6f4f7..b0f329e 100644
--- a/src/JournalEntries.tsx
+++ b/src/JournalEntries.tsx
@@ -1,7 +1,7 @@
 import * as Immutable from 'immutable';
 
 import * as React from 'react';
-import { List, ListItem } from 'material-ui/List';
+import { List, ListItem } from './List';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import IconAdd from 'material-ui/svg-icons/content/add';
diff --git a/src/SideMenu.tsx b/src/SideMenu.tsx
index a248301..fc89923 100644
--- a/src/SideMenu.tsx
+++ b/src/SideMenu.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
-import { List, ListItem } from 'material-ui/List';
-import Subheader from 'material-ui/Subheader';
-import Divider from 'material-ui/Divider';
+import { List, ListItem, ListSubheader, ListDivider } from './List';
 import ActionCode from 'material-ui/svg-icons/action/code';
 import ActionHome from 'material-ui/svg-icons/action/home';
 import ActionBugReport from 'material-ui/svg-icons/action/bug-report';
@@ -52,8 +50,8 @@ class SideMenu extends React.PureComponent {
     if (this.props.etesync) {
       const journals = (this.props.journals && this.props.journals.value) && (
         <React.Fragment>
-          <Divider />
-          <Subheader>Journals</Subheader>
+          <ListDivider />
+          <ListSubheader>Journals</ListSubheader>
           <SideMenuJournals
             etesync={this.props.etesync}
             journals={this.props.journals.value}
@@ -91,8 +89,8 @@ class SideMenu extends React.PureComponent {
             }}
           />
           {loggedInItems}
-          <Divider />
-          <Subheader>External Links</Subheader>
+          <ListDivider />
+          <ListSubheader>External Links</ListSubheader>
           <ListItem primaryText="Website" leftIcon={<ActionHome />} href={C.homePage} />
           <ListItem primaryText="FAQ" leftIcon={<ActionQuestionAnswer />} href={C.faq} />
           <ListItem primaryText="Source Code" leftIcon={<ActionCode />} href={C.sourceCode} />
diff --git a/src/SideMenuJournals.tsx b/src/SideMenuJournals.tsx
index 6590234..deb4885 100644
--- a/src/SideMenuJournals.tsx
+++ b/src/SideMenuJournals.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { ListItem } from 'material-ui/List';
+import { ListItem } from './List';
 
 import * as EteSync from './api/EteSync';