diff --git a/gulpfile.js b/gulpfile.js
index f9ff198d..7cf0908e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,7 +14,6 @@ var electron = require('electron-connect').server.create({
 var packager = require('electron-packager');
 
 var sources = ['**/*.js', '**/*.css', '**/*.html', '!**/node_modules/**', '!**/build/**', '!release/**'];
-var app_root = 'dist';
 
 gulp.task('prettify', ['prettify:sources', 'prettify:jsx']);
 
@@ -43,7 +42,7 @@ gulp.task('prettify:jsx', function() {
       },
       plugins: ['esformatter-jsx']
     }))
-    .pipe(gulp.dest(app_root));
+    .pipe(gulp.dest('src/browser'));
 });
 
 gulp.task('build', ['sync-meta', 'webpack', 'copy'], function() {
@@ -141,7 +140,7 @@ gulp.task('watch', ['build'], function() {
 function makePackage(platform, arch, callback) {
   var packageJson = require('./src/package.json');
   packager({
-    dir: './' + app_root,
+    dir: './dist',
     name: packageJson.name,
     platform: platform,
     arch: arch,
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 3e4aa131..dc3324b3 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -130,7 +130,7 @@ var MainPage = React.createClass({
       tabs_row = (
         <Row>
           <TabBar id="tabBar" teams={ this.props.teams } unreadCounts={ this.state.unreadCounts } mentionCounts={ this.state.mentionCounts } unreadAtActive={ this.state.unreadAtActive } mentionAtActiveCounts={ this.state.mentionAtActiveCounts }
-          activeKey={ this.state.key } onSelect={ this.handleSelect }></TabBar>
+            activeKey={ this.state.key } onSelect={ this.handleSelect }></TabBar>
         </Row>
       );
     }
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index e57ff722..c25e53a8 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -16,7 +16,7 @@ const ListGroup = ReactBootstrap.ListGroup;
 const ListGroupItem = ReactBootstrap.ListGroupItem;
 const Glyphicon = ReactBootstrap.Glyphicon;
 
-function backToIndex(){
+function backToIndex() {
   window.location = 'index.html';
 }
 
@@ -64,8 +64,8 @@ var SettingsPage = React.createClass({
     var teams_row = (
     <Row>
       <Col md={ 12 }>
-        <h2>Teams</h2>
-        <TeamList teams={ this.state.teams } onTeamsChange={ this.handleTeamsChange } />
+      <h2>Teams</h2>
+      <TeamList teams={ this.state.teams } onTeamsChange={ this.handleTeamsChange } />
       </Col>
     </Row>
     );
@@ -77,8 +77,8 @@ var SettingsPage = React.createClass({
     var options_row = (options.length > 0) ? (
       <Row>
         <Col md={ 12 }>
-          <h2>Options</h2>
-          { options }
+        <h2>Options</h2>
+        { options }
         </Col>
       </Row>
       ) : null;
@@ -89,9 +89,9 @@ var SettingsPage = React.createClass({
         { options_row }
         <Row>
           <Col md={ 12 }>
-            <Button id="btnCancel" onClick={ this.handleCancel }>Cancel</Button>
-            { ' ' }
-            <Button id="btnSave" bsStyle="primary" onClick={ this.handleSave } disabled={ this.state.teams.length === 0 }>Save</Button>
+          <Button id="btnCancel" onClick={ this.handleCancel }>Cancel</Button>
+          { ' ' }
+          <Button id="btnSave" bsStyle="primary" onClick={ this.handleSave } disabled={ this.state.teams.length === 0 }>Save</Button>
           </Col>
         </Row>
       </Grid>