diff --git a/app/src/components/Settings.tsx b/app/src/components/Settings.tsx
index 543a861..7c1b92e 100644
--- a/app/src/components/Settings.tsx
+++ b/app/src/components/Settings.tsx
@@ -21,6 +21,7 @@ import { connect } from 'react-redux'
 import { settingsActions, treeActions } from '../actions'
 import { TopicOrder } from '../reducers/Settings'
 import BrokerStatistics from './BrokerStatistics'
+import { shell } from 'electron';
 
 export const autoExpandLimitSet = [{
   limit: 0,
@@ -56,6 +57,11 @@ const styles: StyleRulesCallback = theme => ({
     minWidth: '150px',
     margin: `auto ${theme.spacing(1)} auto ${theme.spacing(2)}px`,
   },
+  author: {
+    margin: 'auto 8px 8px auto',
+    color: theme.palette.text.hint,
+    cursor: 'pointer' as 'pointer',
+  },
 })
 
 interface Props {
@@ -101,11 +107,20 @@ class Settings extends React.Component<Props, {}> {
           {this.renderNodeOrder()}
           {this.renderhighlightTopicUpdates()}
         </div>
+        <Tooltip placement="top" title="App Author">
+          <Typography className={classes.author} onClick={this.openGithubPage}>
+            by Thomas Nordquist
+          </Typography>
+        </Tooltip>
         <BrokerStatistics />
       </Drawer>
     )
   }
 
+  private openGithubPage = () => {
+    shell.openExternal('https://github.com/thomasnordquist')
+  }
+
   private renderhighlightTopicUpdates() {
     const { highlightTopicUpdates, actions } = this.props
 
diff --git a/app/src/components/Tree/TreeNode.tsx b/app/src/components/Tree/TreeNode.tsx
index df0283f..2f09345 100644
--- a/app/src/components/Tree/TreeNode.tsx
+++ b/app/src/components/Tree/TreeNode.tsx
@@ -233,6 +233,10 @@ class TreeNode extends React.Component<Props, State> {
   }
 
   private renderNodes() {
+    if (this.collapsed()) {
+      return null
+    }
+
     return (
       <TreeNodeSubnodes
         animateChanges={this.props.animateChages}