diff --git a/mix-manifest.json b/mix-manifest.json
index f34c6d4..4ed0b80 100644
--- a/mix-manifest.json
+++ b/mix-manifest.json
@@ -1,6 +1,6 @@
{
"/public/js/spritemap.js": "/public/js/spritemap.js?id=2dda73ecee3bb668b395026efda6524c",
- "/public/js/app.js": "/public/js/app.js?id=42bfe8fc554ce4641883c055b1d30a2c",
+ "/public/js/app.js": "/public/js/app.js?id=3af721e60a47e6147d71c98308c2b6e1",
"/public/css/styles.css": "/public/css/styles.css?id=d8096bd2ff84ae29cb0ecf810064b218",
"/public/css/demo.html": "/public/css/demo.html?id=a54a5d205e3152fb64b33dda63ffa555",
"/public/css/IBMPlexMono-Bold.eot": "/public/css/IBMPlexMono-Bold.eot?id=ef1fadf711db80a00542b202ab14f7ee",
diff --git a/packages/frontend/js/app.js b/packages/frontend/js/app.js
index dd26844..e8db547 100644
--- a/packages/frontend/js/app.js
+++ b/packages/frontend/js/app.js
@@ -1,19 +1,19 @@
-require('./bootstrap.js')
+import * as riot from 'riot'
import AppSidebar from './components/sidebar.riot'
import AppTasks from './components/tasks.riot'
-import AppTaskNew from './components/task-new.riot'
+import AppTaskButton from './components/task-new.riot'
import AppTaskForm from './components/task-form.riot'
// register components
riot.register('app-sidebar', AppSidebar)
riot.register('app-tasks', AppTasks)
-riot.register('app-task-new', AppTaskNew)
+riot.register('app-task-button', AppTaskButton)
riot.register('app-task-form', AppTaskForm)
// mount components
riot.mount('app-sidebar')
riot.mount('app-tasks')
-riot.mount('app-task-new')
+riot.mount('app-task-button')
riot.mount('app-task-form')
\ No newline at end of file
diff --git a/packages/frontend/js/bootstrap.js b/packages/frontend/js/bootstrap.js
index f28fa84..26240fe 100644
--- a/packages/frontend/js/bootstrap.js
+++ b/packages/frontend/js/bootstrap.js
@@ -1 +1 @@
-window.riot = require('riot')
\ No newline at end of file
+riot = require('riot')
\ No newline at end of file
diff --git a/packages/frontend/js/components/login.riot b/packages/frontend/js/components/login.riot
deleted file mode 100644
index 86c6b46..0000000
--- a/packages/frontend/js/components/login.riot
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packages/frontend/js/components/sidebar.riot b/packages/frontend/js/components/sidebar.riot
index 3519168..980d9a5 100644
--- a/packages/frontend/js/components/sidebar.riot
+++ b/packages/frontend/js/components/sidebar.riot
@@ -1,5 +1,5 @@
-