diff --git a/view/App.tsx b/view/App.tsx
index e3fec35..ab2d596 100644
--- a/view/App.tsx
+++ b/view/App.tsx
@@ -1,7 +1,7 @@
-import { Tasks } from "obsidian";
 import * as React from "react";
 import { getStats, scoreTask } from "./habiticaAPI"
-import TodoItem from "./TodoItem"
+import Statsview from "./Components/Statsview"
+import Taskview from "./Components/Taskview"
 
 let username = ""
 let credentials = ""
@@ -22,7 +22,7 @@ class App extends React.Component<any,any> {
                     lvl: 0,
                 }
             },
-            tasks: []
+            todos: []
         }
         this.handleChange = this.handleChange.bind(this)
     }
@@ -39,7 +39,7 @@ class App extends React.Component<any,any> {
                     this.setState({
                         isLoaded: true,
                         user_data: result,
-                        tasks: result.tasks.todos
+                        todos: result.tasks.todos
                 })
                 },
                 (error) => {
@@ -54,7 +54,7 @@ class App extends React.Component<any,any> {
         this.reloadData()
     }
     handleChange(event: any){
-        this.state.tasks.forEach((element: any) => {
+        this.state.todos.forEach((element: any) => {
             if(element.id == event.target.id){
                 if(!element.completed){
                     scoreTask(username, credentials, event.target.id, "up")
@@ -100,20 +100,15 @@ class App extends React.Component<any,any> {
     }
 
     render(){
-        const { error, isLoaded, tasks } = this.state;
-        const user_data = this.state.user_data
-        if (error) {
-            return <div>Error: {error.message}</div>;
-        } else if (!isLoaded) {
-            return <div>Loading...</div>;
-        } else {
-            const listItems = tasks.map((tasks: any) =>
-                <TodoItem  key={tasks.id} id={tasks.id} task={tasks} completed={tasks.completed} onChange={this.handleChange}/>
-            );
+        // if(this.state.error)
+        //     return(<div className="loading">Loading....</div>)
+        // else if(this.state.isLoaded)
+        if (!this.state.isLoaded)
+            return <div className="loading">Loading....</div>
+        else {
             return (<div>
-                <h3>{user_data.profile.name}</h3>{"\n"}
-                <div>HP: {user_data.stats.hp}</div><div> XP: {user_data.stats.lvl}</div>{"\n"}
-                <ul>{listItems}</ul>
+                <Statsview user_data={this.state.user_data} />
+                <Taskview todos={this.state.todos} onChange={this.handleChange} />
                 </div>
             );
         }
diff --git a/view/Components/Statsview/index.css b/view/Components/Statsview/index.css
new file mode 100644
index 0000000..e69de29
diff --git a/view/Components/Statsview/index.tsx b/view/Components/Statsview/index.tsx
new file mode 100644
index 0000000..9ea4192
--- /dev/null
+++ b/view/Components/Statsview/index.tsx
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+export default function Index(props: any) {
+    return(
+        <div id="stats">
+            <div id="profile-name">{props.user_data.profile.name}</div>
+            <div id="hp">HP: {props.user_data.stats.hp}</div>
+            <div id="lvl">LVL: {props.user_data.stats.lvl}</div>
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/view/TodoItem.tsx b/view/Components/Taskview/TodoItem.tsx
similarity index 52%
rename from view/TodoItem.tsx
rename to view/Components/Taskview/TodoItem.tsx
index bf681c7..4adc70f 100644
--- a/view/TodoItem.tsx
+++ b/view/Components/Taskview/TodoItem.tsx
@@ -3,8 +3,8 @@
 function TodoItem(props: any) {
     return (
         <div className="todo-item" id={props.id}>
-            <input type="checkbox" id={props.id} onChange={props.onChange} checked={props.completed}/>
-            <p>{props.task.text}</p>
+            <input type="checkbox" className="checkbox" id={props.id} onChange={props.onChange} checked={props.completed}/>
+            <p>{props.todo_text}</p>
         </div>
     )
 }
diff --git a/view/Components/Taskview/index.tsx b/view/Components/Taskview/index.tsx
new file mode 100644
index 0000000..19dee83
--- /dev/null
+++ b/view/Components/Taskview/index.tsx
@@ -0,0 +1,9 @@
+import * as React from "react";
+import TodoItem from "./TodoItem"
+
+export default function Index(props: any){
+    const listItems = props.todos.map((todo: any) => {
+            return <TodoItem key={todo.id} id={todo.id} todo_text={todo.text} onChange={props.onChange} completed={todo.completed}/>
+    })
+    return(<ul>{listItems}</ul>);
+}
\ No newline at end of file