diff --git a/src/main.ts b/src/main.ts
index 45e1054..a0f350a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -34,7 +34,7 @@ export default class HabiticaSync extends Plugin {
                 this.activateView();
             }
         });
-        this.activateView();
+        // this.activateView();
         
     }
     async loadSettings() {
@@ -45,7 +45,7 @@ export default class HabiticaSync extends Plugin {
     }
 
     async onunload() {
-        // await this.view.onClose();
+        await this.view.onClose();
     
         this.app.workspace
             .getLeavesOfType(VIEW_TYPE)
diff --git a/src/view/App.tsx b/src/view/App.tsx
index 445268e..f81736f 100644
--- a/src/view/App.tsx
+++ b/src/view/App.tsx
@@ -195,8 +195,12 @@ class App extends React.Component<any, any> {
             return (<div className="plugin-root">
                 {content}
                 <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
+<<<<<<< HEAD
                 <Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} settings = {this.props.plugin.settings} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/>
                 <div></div>
+=======
+                <Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/>
+>>>>>>> 54e6000eb8811968a7e3082a4995c6e40f96654e
                 <Statsview user_data={this.state.user_data} />
             </div>
             );
diff --git a/styles.css b/styles.css
index 99bb4b5..c0feb7f 100644
--- a/styles.css
+++ b/styles.css
@@ -90,6 +90,7 @@ input[type=checkbox]:focus {
 .plugin-root {
   min-width: 260px;
   display: grid;
+  grid-template-rows: auto 1fr auto;
   height: inherit;
 }