diff --git a/.bowerrc b/.bowerrc
index 244429953a..9c9ea40600 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "assets/bower_components"
+  "directory": "public/bower_components"
 }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 6be095b526..a02e1983f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ node_modules
 config.json
 npm-debug.log
 lib
-assets/bower_components
+public/bower_components
 
 src/*/*.js
 src/*/*.map
diff --git a/assets/css/app/index.styl b/assets/css/app/index.styl
index 96b21b4726..29555d176c 100644
--- a/assets/css/app/index.styl
+++ b/assets/css/app/index.styl
@@ -1,30 +1,30 @@
 //@import "nib/vendor";
 
 // Vendor Includes - include first so we can override
-@import "../../../public/vendor/datepicker/css/datepicker.css";
+@import "../../../public/vendor/datepicker/css/datepicker.css"
 
 // Custom includes
-@import "./female_sprites.styl";
-@import "./male_sprites.styl";
-@import "./shop_sprites.styl";
-@import "./tasks.styl";
-@import "./avatar.styl";
-@import "./customizer.styl";
-@import "./items.styl";
-@import "./inventory.styl";
-@import "./alerts.styl";
-@import "../../../public/img/sprites/pet_sprites.css";
-@import "../../../public/img/sprites/PetEggs.css";
-@import "./helpers.styl";
-@import "./responsive.styl";
-@import "./header.styl";
-@import "./filters.styl";
-@import "./scrollbars.styl";
-@import "./achievements.styl";
-@import "./game-pane.styl";
-@import "./backer.styl";
-@import "./npcs.styl";
-@import "./challenges.styl";
+@import "./female_sprites.styl"
+@import "./male_sprites.styl"
+@import "./shop_sprites.styl"
+@import "./tasks.styl"
+@import "./avatar.styl"
+@import "./customizer.styl"
+@import "./items.styl"
+@import "./inventory.styl"
+@import "./alerts.styl"
+@import "../../../public/img/sprites/pet_sprites.css"
+@import "../../../public/img/sprites/PetEggs.css"
+@import "./helpers.styl"
+@import "./responsive.styl"
+@import "./header.styl"
+@import "./filters.styl"
+@import "./scrollbars.styl"
+@import "./achievements.styl"
+@import "./game-pane.styl"
+@import "./backer.styl"
+@import "./npcs.styl"
+@import "./challenges.styl"
 
 // fix exploding to very wide for some reason
 .datepicker
diff --git a/assets/css/bootstrap-responsive.styl b/assets/css/bootstrap-responsive.styl
deleted file mode 100644
index 297945e48b..0000000000
--- a/assets/css/bootstrap-responsive.styl
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*!
- * Bootstrap Responsive v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-.visible-desktop {
-  display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.564102564102564%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.7624309392265194%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .uneditable-input[class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: 100%;
-    margin-left: 0;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    left: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade {
-    top: -100px;
-  }
-  .modal.fade.in {
-    top: 20px;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .media .pull-left,
-  .media .pull-right {
-    display: block;
-    float: none;
-    margin-bottom: 10px;
-  }
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-  .modal {
-    top: 10px;
-    right: 10px;
-    left: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 20px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 20px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #777777;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #777777;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .dropdown-menu a:hover {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: #999999;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: none;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-  }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-    -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/views/layout.jade b/views/layout.jade
index 00dfb10bdc..58f90c1f69 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -4,26 +4,25 @@ html
     title HabitRPG | Your Life The Role Playing Game
 
     // CSS
-    != css('app/index')
-    != css('/bower_components/bootstrap/docs/assets/css/bootstrap')
-    != css('/bower_components/bootstrap/docs/assets/css/bootstrap-responsive')
-    != css('/bower_components/angular-ui/build/angular-ui')
+    link(rel='stylesheet', href='/vendor/bootstrap/css/bootstrap.css')
+    link(rel='stylesheet', href='/vendor/bootstrap/css/bootstrap-responsive.css')
+    link(rel='stylesheet', href='/bower_components/angular-ui/build/angular-ui.css')
     != css('app/index')
 
     // JS
-    != js('/bower_components/jquery/jquery.min')
-    != js('/bower_components/lodash/lodash')
-    != js('/bower_components/moment/moment')
-    != js('/bower_components/angular/angular')
-    != js('/bower_components/angular-resource/angular-resource')
-    != js('/bower_components/angular-ui/build/angular-ui')
-    != js('/bower_components/angular-bootstrap/ui-bootstrap')
-    != js('/bower_components/angular-bootstrap/ui-bootstrap-tpls')
+    script(type='text/javascript', src='/bower_components/jquery/jquery.min.js')
+    script(type='text/javascript', src='/bower_components/lodash/lodash.js')
+    script(type='text/javascript', src='/bower_components/moment/moment.js')
+    script(type='text/javascript', src='/bower_components/angular/angular.js')
+    script(type='text/javascript', src='/bower_components/angular-resource/angular-resource.js')
+    script(type='text/javascript', src='/bower_components/angular-ui/build/angular-ui.js')
+    script(type='text/javascript', src='/bower_components/angular-bootstrap/ui-bootstrap.js')
+    script(type='text/javascript', src='/bower_components/angular-bootstrap/ui-bootstrap-tpls.js')
 
     // Bootstrap
 
     // HabitRPG
-    != js('/bower_components/habitrpg-shared/browser/browser.debug')
+    script(type='text/javascript', src='/bower_components/habitrpg-shared/browser/browser.debug.js')
 
     != js('app')
 
diff --git a/views/tasks/task-list.html b/views/tasks/task-list.html
deleted file mode 100644
index a571201970..0000000000
--- a/views/tasks/task-list.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--helpTitle & helpContent moved to tour -->
-
-<!--
-header="habits"
-type="habit"
-inputValue={_newHabit}
-placeHolder="New Habit"
-list={@habits}
-main={{@main}}
-editable={@editable}
--->
-
-<!-- Habits Column -->
-<div class="module" ng-class="'rewards-module': type=='reward'">
-    <div class="task-column {{type}}s" ng-class="'tabbable tabs-below': type=='todo'">
-
-        <!-- todos export/graph options -->
-            <span ng-if="main && type=='todo'" class='option-box pull-right'>
-                <a ng-show='user.history.todos' class="option-action" x-bind=click:toggleChart data-id="todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
-                <a class="option-action" ng-href="/v1/users/{{user.id}}/calendar.ics?apiToken={{user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
-                <!-- <a href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}" rel=tooltip title="Google Calendar"><i class=icon-calendar></i></a> -->
-            </span>
-
-        <!-- cash or gems -->
-            <span ng-if="main && type=='reward'" class='option-box pull-right wallet'>
-                <div class="money">
-                    {{gold(floor(user.stats.gp))}}
-                    <span class='shop_gold' rel='tooltip' title='Gold'></span>
-                </div>
-                <div class="money">
-                    {{silver(user.stats.gp)}}
-                    <span class='shop_silver' rel='tooltip' title='Silver'></span>
-                </div>
-            </span>
-
-        <h2 class="task-column_title">{{header}}</h2>
-
-        <div ng-if='type == "todo"' class='todos-chart' ng-class="hidden:_page.charts.todos"></div>
-
-        <form ng-show='editable' class="addtask-form form-inline new-task-form" ng-class="hidden: _showCompleted && type=='todo'" data-task-type="{{type}}" x-bind="submit:addTask">
-            <span class="addtask-field"><input value="{{inputValue}}" type="text" placeholder="{{placeHolder}}"/></span>
-            <input class="addtask-btn" type="submit" value="＋">
-        </form>
-        <hr>
-        <ul class="{{type}}s" ng-class="hidden: !list">
-            <app:tasks:task ng-repeat='task in list' />
-        </ul>
-
-        <!-- Static Rewards -->
-        <ul ng-show="main && type=='reward'" class='items' ng-class="hidden:!user.flags.itemsEnabled">
-            <rewarditem data-item='{{_items.next.weapon}}' />
-            <rewarditem data-item='{{_items.next.armor}}' />
-            <rewarditem data-item='{{_items.next.head}}' />
-            <rewarditem data-item='{{_items.next.shield}}' />
-            <rewarditem data-item='{{_items.potion}}' />
-            <rewarditem data-item='{{_items.reroll}}' />
-        </ul>
-
-        <br/>
-        <!-- ads -->
-        <div ng-if="authenticated() && user.flags.ads != hide && main">
-
-                    <span class='pull-right'>
-                        <a x-bind="click:showStripe" rel='tooltip' title='Remove Ads'><i class='icon-remove'></i></a><br/>
-                        <a href="#" data-target="#why-ads-modal" data-toggle="modal" rel='tooltip' title='Why Ads?'><i class='icon-question-sign'></i></a>
-                    </span>
-
-            <a ng-if='type=="habit"' href="http://www.amazon.com/gp/product/1400069289/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1400069289&linkCode=as2&tag=ha0d2-20">The Power of Habit: Why We Do What We Do in Life and Business</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=1400069289" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-            <a ng-if='type=="daily"' href="http://www.amazon.com/gp/product/0142000280/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0142000280&linkCode=as2&tag=ha0d2-20">Getting Things Done: The Art of Stress-Free Productivity</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=0142000280" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-            <a ng-if='type=="todo"' href="http://www.amazon.com/gp/product/0312430000/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0312430000&linkCode=as2&tag=ha0d2-20">The Checklist Manifesto: How to Get Things Right</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=0312430000" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-            <a ng-if='type="reward"' href="http://www.amazon.com/gp/product/1594484805/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1594484805&linkCode=as2&tag=ha0d2-20">Drive: The Surprising Truth About What Motivates Us</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=1594484805" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-        </div>
-
-
-        <div ng-if="type='todo'">
-            <button class='task-action-btn tile spacious bright' ng-show="_showCompleted" x-bind=click:clearCompleted>Clear Completed</button>
-
-            <!-- remaining/completed tabs -->
-            <ul class="nav nav-tabs">
-                <li ng-class="active:!_showCompleted"><a x-bind="click:todosShowRemaining">Remaining</a></li>
-                <li ng-class="active:_showCompleted"><a x-bind="click:todosShowCompleted">Complete</a></li>
-            </ul>
-        </div>
-
-    </div>
-</div>
\ No newline at end of file
diff --git a/views/tasks/task-list.jade b/views/tasks/task-list.jade
index 9505d6d0a9..8e793d838b 100644
--- a/views/tasks/task-list.jade
+++ b/views/tasks/task-list.jade
@@ -34,7 +34,7 @@ div(ng-controller='TasksCtrl')
 
       // Actual List
       ul(class='{{list.type}}s', ng-show='list.list')
-        app:tasks:task(ng-repeat='task in list.list')
+        include ./task
 
       // Static Rewards
       ul.items(ng-show='list.main && list.type=="reward"', ng-show='user.flags.itemsEnabled')
diff --git a/views/tasks/task.html b/views/tasks/task.html
new file mode 100644
index 0000000000..18eb8b2772
--- /dev/null
+++ b/views/tasks/task.html
@@ -0,0 +1,193 @@
+<task:>
+    <li data-id={{:task.id}} class="task {taskClasses(:task, users[_userId].filters, _user.preferences.dayStart, _user.lastCron, _showCompleted, @main)}">
+
+        <!-- right-hand side control buttons -->
+        <div class="task-meta-controls">
+            <!-- Streak -->
+            <span class='{#unless :task.streak}hide{/}'>
+                {:task.streak}<span rel='tooltip' title='Streak Counter'><i class='icon-forward'></i></span>
+            </span>
+            <app:filters:applied-filters />
+            <!-- edit -->
+            <a x-bind=click:toggleTaskEdit rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+            <!-- challenges -->
+            {{#if :task.challenge}}
+            {{#if brokenChallengeLink(:task)}}
+            <i class='icon-bullhorn' style='background-color:red;' x-bind=click:toggleTaskEdit rel=tooltip title="Broken Challenge Link"></i>
+            {{else}}
+            <i class='icon-bullhorn' rel=tooltip title="Challenge Task"></i>
+            {{/}}
+            {{else}}
+            <!-- delete -->
+            <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+            {{/}}
+            <!-- chart -->
+            {#if :task.history}
+            <a x-bind=click:toggleChart data-id="{{:task.id}}" rel="tooltip" title="Progress"><i class="icon-signal"></i></a>
+            {/}
+            <!-- notes -->
+            {#if :task.notes}
+            <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+            {/}
+        </div>
+
+        <!-- left-hand side checkbox -->
+        <div class="task-controls task-primary">
+            <!-- Habits -->
+            {{#if equal(:task.type,'habit')}}
+            {{#if @main}} <!-- only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges -->
+            {#if :task.up}<a class="task-action-btn" data-direction=up x-bind=click:score>＋</a>{/}
+            {#if :task.down}<a class="task-action-btn" data-direction=down x-bind=click:score>−</a>{/}
+            {{else}}
+            {#if :task.up}<span class="task-action-btn">＋</span>{/}
+            {#if :task.down}<span class="task-action-btn">−</span>{/}
+            {{/}}
+
+            <!-- Rewards -->
+            {{else if equal(:task.type,'reward')}}
+            {{#if @main}} <!-- only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges -->
+            <a class="money btn-buy" x-bind=click:score data-direction=down>
+                <span class="reward-cost">{:task.value}</span>
+                <span class='shop_gold'></span>
+            </a>
+            {{else}}
+                    <span class="money btn-buy">
+                        <span class="reward-cost">{:task.value}</span>
+                        <span class='shop_gold'></span>
+                    </span>
+            {{/}}
+
+            <!-- Daily & Todos -->
+            {{else}}
+                <span class="task-checker action-yesno">
+                    {{#if @main}} <!-- only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges -->
+                        <input type=checkbox id="box-{{:task.id}}" class="visuallyhidden focusable" checked="{:task.completed}">
+                        <label for="box-{{:task.id}}"></label>
+                    {{else}}
+                        <input type=checkbox id="box-{{:task.id}}-static" class="visuallyhidden focusable" checked="false">
+                        <label for="box-{{:task.id}}-static"></label>
+                    {{/}}
+                </span>
+            {{/}}
+        </div>
+
+        <!-- main content -->
+        <p class="task-text">
+            {{#if taskInChallenge(:task)}}
+            {{taskAttrFromChallenge(:task,'text')}}
+            {{else}}
+            {:task.text}
+            {{/}}
+        </p>
+
+        <!-- edit/options dialog -->
+        <app:tasks:taskMeta main={{@main}} />
+    </li>
+
+    <!-- task edit/options -->
+    <taskMeta:>
+        <div class="{#unless _tasks.editing[:task.id]}visuallyhidden{/} task-options">
+            {{#if brokenChallengeLink(:task)}}
+            <div class='well'>
+                <p>Broken Challenge Link: this task was part of a challenge, but (a) challenge (or containing group) has been deleted, or (b) the task was deleted from the challenge.</p>
+                <p><a>Keep</a> | <a>Keep all from challenge</a> | <a>Delete</a> | <a>Delete all from challenge</a></p>
+            </div>
+            {{/}}
+            <form x-bind="submit:toggleTaskEdit" >
+                <!-- text & notes -->
+                <fieldset class="option-group">
+                    {{#unless taskInChallenge(:task)}}
+                    <label class="option-title">Text</label><input class="option-content" type=text value={:task.text}>
+                    {{/}}
+                    <label class="option-title">Extra Notes</label>
+                    {{#if taskInChallenge(:task)}}
+                    <textarea class="option-content" rows=3 disabled>{{taskAttrFromChallenge(:task,'notes')}}</textarea>
+                    {{else}}
+                    <textarea class="option-content" rows=3>{:task.notes}</textarea>
+                    {{/}}
+                </fieldset>
+
+                <!-- if Habit, plus/minus command options -->
+                {#if equal(:task.type, 'habit')}
+                {#unless taskInChallenge(:task)}
+                <fieldset class="option-group">
+                    <legend class="option-title">Direction/Actions</legend>
+                    <span class="task-checker action-plusminus select-toggle">
+                        <input class="visuallyhidden focusable" type=checkbox id="{{:task.id}}-option-plus" checked={:task.up}>
+                        <label for="{{:task.id}}-option-plus"></label>
+                    </span>
+                    <span class="task-checker action-plusminus select-toggle">
+                        <input class="visuallyhidden focusable" type=checkbox id="{{:task.id}}-option-minus" checked={:task.down}>
+                        <label for="{{:task.id}}-option-minus"></label>
+                    </span>
+                </fieldset>
+                {/}
+
+                <!-- if Daily, calendar -->
+                {else if equal(:task.type, 'daily')}
+                <fieldset class="option-group">
+                    <legend class="option-title">Repeat</legend>
+                    <div class="task-controls tile-group repeat-days">
+                        <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
+                    </div>
+                </fieldset>
+
+                <!-- if Reward, pricing -->
+                {else if equal(:task.type, 'reward')}
+                <fieldset class="option-group option-short">
+                    <legend class="option-title">Price</legend>
+                    <input class="option-content" size="16" type="number" min="0" value={:task.value}>
+                    <div class="money input-suffix"><span class='shop_gold'></span></div>
+                </fieldset>
+
+
+                <!-- if Todo, the due date -->
+                {else if equal(:task.type, 'todo')}
+                <fieldset class="option-group">
+                    <legend class="option-title">Due Date</legend>
+                    <input class="option-content datepicker" type="text" value="{:task.date}" data-date-format="mm/dd/yyyy">
+                </fieldset>
+                {/}
+
+
+                {{#if @main}}<app:filters:filter-fieldgroup />{{/}}
+
+
+                <!-- Advanced Options -->
+                {#unless equal(:task.type, 'reward')}
+                <p x-bind="click:tasksToggleAdvanced" class="option-title mega">Advanced Options</p>
+                <fieldset class="option-group advanced-option visuallyhidden">
+                    <legend class="option-title"><a class='priority-multiplier-help' href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a> Difficulty</legend>
+
+                    {{#if taskInChallenge(:task)}}
+                    <button disabled type="button" class="task-action-btn tile active">
+                        {{taskAttrFromChallenge(:task,'priority')}}
+                    </button>
+                    {{else}}
+                    <div class="task-controls tile-group priority-multiplier" data-id="{{:task.id}}">
+                        <button type="button" class="task-action-btn tile {#if or(equal(:task.priority,'!'),not(:task.priority))}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
+                        <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
+                        <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>
+                    </div>
+                    {{/}}
+
+                    {{#if equal(:task.type,'daily')}}
+                    <legend class="option-title">Restore Streak</legend>
+                    <input class='option-content' type=number value="{int(:task.streak)}" />
+                    {{/}}
+                </fieldset>
+                {/}
+
+
+                <button type=submit class="task-action-btn tile spacious" x-bind="click:tasksSaveAndClose">Save & Close</button>
+            </form>
+        </div>
+
+        <div class="{#unless _page.charts[:task.id]}hidden{/} {{:task.id}}-chart"></div>
diff --git a/views/tasks/task.jade b/views/tasks/task.jade
new file mode 100644
index 0000000000..e43a55cb80
--- /dev/null
+++ b/views/tasks/task.jade
@@ -0,0 +1,149 @@
+li(ng-repeat='task in list.list', class='task {{taskClasses(task,user.filters,user.preferences.dayStart,user.lastCron,_showCompleted,list.main)}}', data-id='{{task.id}}')
+  // right-hand side control buttons
+  .task-meta-controls
+    // Streak
+    span(ng-show='task.streak') {{task.streak}}
+      span(rel='tooltip', title='Streak Counter')
+        i.icon-forward
+    app:filters:applied-filters
+    // edit
+    a(ng-click='task._editing = !task._editing', rel='tooltip', title='Edit')
+      i.icon-pencil
+    //- challenges
+    //  {{#if task.challenge}}
+    //      {{#if brokenChallengeLink(task)}}
+    //          <i class='icon-bullhorn' style='background-color:red;' x-bind=click:toggleTaskEdit rel=tooltip title="Broken Challenge Link"></i>
+    //      {{else}}
+    //          <i class='icon-bullhorn' rel=tooltip title="Challenge Task"></i>
+    //      {{/}}
+    //  {{else}}
+
+    // delete
+    a(x-bind='click:del', rel='tooltip', title='Delete')
+      i.icon-trash
+    // chart
+    a(ng-show='task.history', x-bind='click:toggleChart', data-id='{{task.id}}', rel='tooltip', title='Progress')
+      i.icon-signal
+    // notes
+    span.task-notes(ng-show='task.notes', rel='popover', data-trigger='hover', data-placement='left', data-content='{{task.notes}}', data-original-title='{{task.text}}')
+      i.icon-comment
+
+  // left-hand side checkbox
+  .task-controls.task-primary
+
+    // Habits
+    span(ng-if='list.main && task.type=="habit"')
+      // only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges
+      a.task-action-btn(ng-show='task.up', data-direction='up', x-bind='click:score') +
+      a.task-action-btn(ng-show='task.down', data-direction='down', x-bind='click:score') -
+    //span(ng-if='!list.main')
+    //  span.task-action-btn(ng-show='task.up') +
+    //  span.task-action-btn(ng-show='task.down') =
+
+    // Rewards
+    span(ng-if='list.main && type=="reward"')
+      // only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges
+      a.money.btn-buy(x-bind='click:score', data-direction='down')
+        span.reward-cost {{task.value}}
+        span.shop_gold
+      //span(ng-if='!list.main')
+      //  span.money.btn-buy
+      //    span.reward-cost {{task.value}}
+      //    span.shop_gold
+
+    // Daily & Todos
+    span.task-checker.action-yesno(ng-if='task.type=="daily" || task.type=="todo"')
+      // only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges
+      //span(ng-if='list.main')
+      input.visuallyhidden.focusable(id='box-{{task.id}}', type='checkbox', ng-model='task.completed')
+      label(for='box-{{task.id}}')
+      //span(ng-if='!list.main')
+      //  input.visuallyhidden.focusable(id='box-{{task.id}}-static',type='checkbox', checked='false')
+      //  label(for='box-{{task.id}}-static')
+  // main content
+  p.task-text
+    // {{#if taskInChallenge(task)}}
+    // {{taskAttrFromChallenge(task,'text')}}
+    // {{else}}
+    | {{task.text}}
+    // {{/}}
+
+  // edit/options dialog
+  .task-options(ng-show='task._editing')
+    // {{#if brokenChallengeLink(task)}}
+    // <div class='well'>
+    // <p>Broken Challenge Link: this task was part of a challenge, but (a) challenge (or containing group) has been deleted, or (b) the task was deleted from the challenge.</p>
+    // <p><a>Keep</a> | <a>Keep all from challenge</a> | <a>Delete</a> | <a>Delete all from challenge</a></p>
+    // </div>
+    // {{/}}
+    form(x-bind='submit:toggleTaskEdit')
+      // text & notes
+      fieldset.option-group
+        // {{#unless taskInChallenge(task)}}
+        label.option-title Text
+        input.option-content(type='text', ng-model='task.text')
+        // {{/}}
+        label.option-title Extra Notes
+        // {{#if taskInChallenge(task)}}
+        // <textarea class="option-content" rows=3 disabled>{{taskAttrFromChallenge(task,'notes')}}</textarea>
+        // {{else}}
+        textarea.option-content(rows='3', ng-model='task.notes')
+        // {{/}}
+      // if Habit, plus/minus command options
+      // {{#unless taskInChallenge(task)}}
+      fieldset.option-group(ng-if='task.type=="habit"')
+        legend.option-title Direction/Actions
+        span.task-checker.action-plusminus.select-toggle
+          input.visuallyhidden.focusable(id='{{task.id}}-option-plus', type='checkbox', checked='{{task.up}}')
+          label(for='{{task.id}}-option-plus')
+        span.task-checker.action-plusminus.select-toggle
+          input.visuallyhidden.focusable(id='{{task.id}}-option-minus', type='checkbox', checked='{{task.down}}')
+          label(for='{{task.id}}-option-minus')
+      // {{/}}
+      // if Daily, calendar
+      fieldset(ng-if='task.type=="daily"', class="option-group")
+        legend.option-title Repeat
+        .task-controls.tile-group.repeat-days
+          // note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding
+          button.task-action-btn.tile(ng-class='{active: task.repeat.su}', type='button', data-day='su', x-bind='click:toggleDay') Su
+          button.task-action-btn.tile(ng-class='{active: task.repeat.m}', type='button', data-day='m', x-bind='click:toggleDay') M
+          button.task-action-btn.tile(ng-class='{active: task.repeat.t}', type='button', data-day='t', x-bind='click:toggleDay') T
+          button.task-action-btn.tile(ng-class='{active: task.repeat.w}', type='button', data-day='w', x-bind='click:toggleDay') W
+          button.task-action-btn.tile(ng-class='{active: task.repeat.th}', type='button', data-day='th', x-bind='click:toggleDay') Th
+          button.task-action-btn.tile(ng-class='{active: task.repeat.f}', type='button', data-day='f', x-bind='click:toggleDay') F
+          button.task-action-btn.tile(ng-class='{active: task.repeat.s}', type='button', data-day='s', x-bind='click:toggleDay') S
+      // if Reward, pricing
+      fieldset.option-group.option-short(ng-if='task.type=="reward"')
+        legend.option-title Price
+        input.option-content(type='number', size='16', min='0', value='{{task.value}}')
+        .money.input-suffix
+          span.shop_gold
+      // if Todos, the due date
+      fieldset.option-group(ng-if='task.type=="todo"')
+        legend.option-title Due Date
+        input.option-content.datepicker(type='text', value='{{task.date}}', data-date-format='mm/dd/yyyy')
+      app:filters:filter-fieldgroup(ng-if='list.main')
+      // Advanced Options
+      span(ng-if='task.type=="reward"')
+        p.option-title.mega(x-bind='clicktasksToggleAdvanced') Advanced Options
+        fieldset.option-group.advanced-option.visuallyhidden
+          legend.option-title
+            a.priority-multiplier-help(href='https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17', target='_blank')
+              i.icon-question-sign
+            | Difficulty
+          // {{#if taskInChallenge(task)}}
+          // <button disabled type="button" class="task-action-btn tile active">
+          // {{taskAttrFromChallenge(task,'priority')}}
+          // </button>
+          // {{else}}
+          .task-controls.tile-group.priority-multiplier(data-id='{{task.id}}')
+            button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!" || !task.priority}', data-priority='!', x-bind='clicktasksSetPriority') Easy
+            button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!"}', data-priority='!!', x-bind='clicktasksSetPriority') Medium
+            button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!!"}', data-priority='!!!', x-bind='clicktasksSetPriority') Hard
+          // {{/}}
+          span(ng-if='task.type=="daily"')
+            legend.option-title Restore Streak
+            input.option-content(type='number', ng-model='task.streak')
+      button.task-action-btn.tile.spacious(type='submit', x-bind='clicktasksSaveAndClose') Save & Close
+
+  div(class='{{task.id}}-chart', ng-show='_page.charts[task.id]')
diff --git a/views/tasks/tasks.html b/views/tasks/tasks.html
deleted file mode 100644
index f1dbf12fc9..0000000000
--- a/views/tasks/tasks.html
+++ /dev/null
@@ -1,284 +0,0 @@
-
-<task-lists:>
-    <!--helpTitle & helpContent moved to tour -->
-
-    <!--
-    header="habits"
-    type="habit"
-    inputValue={_newHabit}
-    placeHolder="New Habit"
-    list={@habits}
-    main={{@main}}
-    editable={@editable}
-    -->
-
-    <!-- Habits Column -->
-    <div class="module" ng-class="'rewards-module': type=='reward'">
-        <div class="task-column {{type}}s" ng-class="'tabbable tabs-below': type=='todo'">
-
-            <!-- todos export/graph options -->
-            <span ng-if="main && type=='todo'" class='option-box pull-right'>
-                <a ng-show='user.history.todos' class="option-action" x-bind=click:toggleChart data-id="todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
-                <a class="option-action" ng-href="/v1/users/{{user.id}}/calendar.ics?apiToken={{user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
-                <!-- <a href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}" rel=tooltip title="Google Calendar"><i class=icon-calendar></i></a> -->
-            </span>
-
-            <!-- cash or gems -->
-            <span ng-if="main && type=='reward'" class='option-box pull-right wallet'>
-                <div class="money">
-                    {{gold(floor(user.stats.gp))}}
-                    <span class='shop_gold' rel='tooltip' title='Gold'></span>
-                </div>
-                <div class="money">
-                    {{silver(user.stats.gp)}}
-                    <span class='shop_silver' rel='tooltip' title='Silver'></span>
-                </div>
-            </span>
-
-            <h2 class="task-column_title">{{header}}</h2>
-
-            <div ng-if='type == "todo"' class='todos-chart' ng-class="hidden:_page.charts.todos"></div>
-
-                <form ng-show='editable' class="addtask-form form-inline new-task-form" ng-class="hidden: _showCompleted && type=='todo'" data-task-type="{{type}}" x-bind="submit:addTask">
-                    <span class="addtask-field"><input value="{{inputValue}}" type="text" placeholder="{{placeHolder}}"/></span>
-                    <input class="addtask-btn" type="submit" value="＋">
-                </form>
-                    <hr>
-                <ul class="{{type}}s" ng-class="hidden: !list">
-                    <app:tasks:task ng-repeat='task in list' />
-                </ul>
-
-                <!-- Static Rewards -->
-                <ul ng-show="main && type=='reward'" class='items' ng-class="hidden:!user.flags.itemsEnabled">
-                    <app:rewards:item item={{_items.next.weapon}} />
-                    <app:rewards:item item={{_items.next.armor}} />
-                    <app:rewards:item item={{_items.next.head}} />
-                    <app:rewards:item item={{_items.next.shield}} />
-                    <app:rewards:item item={{_items.potion}} />
-                    <app:rewards:item item={{_items.reroll}} />
-                </ul>
-
-                <br/>
-                <!-- ads -->
-                <div ng-if="authenticated() && user.flags.ads != hide && main">
-
-                    <span class='pull-right'>
-                        <a x-bind="click:showStripe" rel='tooltip' title='Remove Ads'><i class='icon-remove'></i></a><br/>
-                        <a href="#" data-target="#why-ads-modal" data-toggle="modal" rel='tooltip' title='Why Ads?'><i class='icon-question-sign'></i></a>
-                    </span>
-
-                    <a ng-if='type=="habit"' href="http://www.amazon.com/gp/product/1400069289/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1400069289&linkCode=as2&tag=ha0d2-20">The Power of Habit: Why We Do What We Do in Life and Business</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=1400069289" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-                    <a ng-if='type=="daily"' href="http://www.amazon.com/gp/product/0142000280/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0142000280&linkCode=as2&tag=ha0d2-20">Getting Things Done: The Art of Stress-Free Productivity</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=0142000280" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-                    <a ng-if='type=="todo"' href="http://www.amazon.com/gp/product/0312430000/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0312430000&linkCode=as2&tag=ha0d2-20">The Checklist Manifesto: How to Get Things Right</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=0312430000" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-                    <a ng-if='type="reward"' href="http://www.amazon.com/gp/product/1594484805/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1594484805&linkCode=as2&tag=ha0d2-20">Drive: The Surprising Truth About What Motivates Us</a><img src="//www.assoc-amazon.com/e/ir?t=ha0d2-20&l=as2&o=1&a=1594484805" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
-                </div>
-
-
-                <div ng-if="type='todo'">
-                    <button class='task-action-btn tile spacious bright' ng-show="_showCompleted" x-bind=click:clearCompleted>Clear Completed</button>
-
-                    <!-- remaining/completed tabs -->
-                    <ul class="nav nav-tabs">
-                        <li ng-class="active:!_showCompleted"><a x-bind="click:todosShowRemaining">Remaining</a></li>
-                        <li ng-class="active:_showCompleted"><a x-bind="click:todosShowCompleted">Complete</a></li>
-                    </ul>
-                </div>
-
-        </div>
-    </div>
-
-
-<!-- all the parts of a single task -->
-<task:>
-    <li data-id={{:task.id}} class="task {taskClasses(:task, users[_userId].filters, _user.preferences.dayStart, _user.lastCron, _showCompleted, @main)}">
-
-        <!-- right-hand side control buttons -->
-        <div class="task-meta-controls">
-            <!-- Streak -->
-            <span class='{#unless :task.streak}hide{/}'>
-                {:task.streak}<span rel='tooltip' title='Streak Counter'><i class='icon-forward'></i></span>
-            </span>
-            <app:filters:applied-filters />
-            <!-- edit -->
-            <a x-bind=click:toggleTaskEdit rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-            <!-- challenges -->
-            {{#if :task.challenge}}
-                {{#if brokenChallengeLink(:task)}}
-                    <i class='icon-bullhorn' style='background-color:red;' x-bind=click:toggleTaskEdit rel=tooltip title="Broken Challenge Link"></i>
-                {{else}}
-                    <i class='icon-bullhorn' rel=tooltip title="Challenge Task"></i>
-                {{/}}
-            {{else}}
-                <!-- delete -->
-                <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-            {{/}}
-            <!-- chart -->
-            {#if :task.history}
-              <a x-bind=click:toggleChart data-id="{{:task.id}}" rel="tooltip" title="Progress"><i class="icon-signal"></i></a>
-            {/}
-            <!-- notes -->
-            {#if :task.notes}
-            <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
-            {/}
-        </div>
-
-        <!-- left-hand side checkbox -->
-        <div class="task-controls task-primary">
-            <!-- Habits -->
-            {{#if equal(:task.type,'habit')}}
-                {{#if @main}} <!-- only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges -->
-                    {#if :task.up}<a class="task-action-btn" data-direction=up x-bind=click:score>＋</a>{/}
-                    {#if :task.down}<a class="task-action-btn" data-direction=down x-bind=click:score>−</a>{/}
-                {{else}}
-                    {#if :task.up}<span class="task-action-btn">＋</span>{/}
-                    {#if :task.down}<span class="task-action-btn">−</span>{/}
-                {{/}}
-
-            <!-- Rewards -->
-            {{else if equal(:task.type,'reward')}}
-                {{#if @main}} <!-- only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges -->
-                    <a class="money btn-buy" x-bind=click:score data-direction=down>
-                        <span class="reward-cost">{:task.value}</span>
-                        <span class='shop_gold'></span>
-                    </a>
-                {{else}}
-                    <span class="money btn-buy">
-                        <span class="reward-cost">{:task.value}</span>
-                        <span class='shop_gold'></span>
-                    </span>
-                {{/}}
-
-            <!-- Daily & Todos -->
-            {{else}}
-                <span class="task-checker action-yesno">
-                    {{#if @main}} <!-- only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges -->
-                        <input type=checkbox id="box-{{:task.id}}" class="visuallyhidden focusable" checked="{:task.completed}">
-                        <label for="box-{{:task.id}}"></label>
-                    {{else}}
-                        <input type=checkbox id="box-{{:task.id}}-static" class="visuallyhidden focusable" checked="false">
-                        <label for="box-{{:task.id}}-static"></label>
-                    {{/}}
-                </span>
-            {{/}}
-        </div>
-
-        <!-- main content -->
-        <p class="task-text">
-            {{#if taskInChallenge(:task)}}
-                {{taskAttrFromChallenge(:task,'text')}}
-            {{else}}
-                {:task.text}
-            {{/}}
-        </p>
-
-        <!-- edit/options dialog -->
-        <app:tasks:taskMeta main={{@main}} />
-    </li>
-
-<!-- task edit/options -->
-<taskMeta:>
-    <div class="{#unless _tasks.editing[:task.id]}visuallyhidden{/} task-options">
-        {{#if brokenChallengeLink(:task)}}
-            <div class='well'>
-                <p>Broken Challenge Link: this task was part of a challenge, but (a) challenge (or containing group) has been deleted, or (b) the task was deleted from the challenge.</p>
-                <p><a>Keep</a> | <a>Keep all from challenge</a> | <a>Delete</a> | <a>Delete all from challenge</a></p>
-            </div>
-        {{/}}
-        <form x-bind="submit:toggleTaskEdit" >
-            <!-- text & notes -->
-            <fieldset class="option-group">
-                {{#unless taskInChallenge(:task)}}
-                    <label class="option-title">Text</label><input class="option-content" type=text value={:task.text}>
-                {{/}}
-                <label class="option-title">Extra Notes</label>
-                {{#if taskInChallenge(:task)}}
-                    <textarea class="option-content" rows=3 disabled>{{taskAttrFromChallenge(:task,'notes')}}</textarea>
-                {{else}}
-                    <textarea class="option-content" rows=3>{:task.notes}</textarea>
-                {{/}}
-            </fieldset>
-
-            <!-- if Habit, plus/minus command options -->
-            {#if equal(:task.type, 'habit')}
-                {#unless taskInChallenge(:task)}
-                <fieldset class="option-group">
-                    <legend class="option-title">Direction/Actions</legend>
-                    <span class="task-checker action-plusminus select-toggle">
-                        <input class="visuallyhidden focusable" type=checkbox id="{{:task.id}}-option-plus" checked={:task.up}>
-                        <label for="{{:task.id}}-option-plus"></label>
-                    </span>
-                    <span class="task-checker action-plusminus select-toggle">
-                        <input class="visuallyhidden focusable" type=checkbox id="{{:task.id}}-option-minus" checked={:task.down}>
-                        <label for="{{:task.id}}-option-minus"></label>
-                    </span>
-                </fieldset>
-                {/}
-
-            <!-- if Daily, calendar -->
-            {else if equal(:task.type, 'daily')}
-                <fieldset class="option-group">
-                    <legend class="option-title">Repeat</legend>
-                    <div class="task-controls tile-group repeat-days">
-                        <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
-                        <button type="button" class="task-action-btn tile {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
-                    </div>
-                </fieldset>
-
-            <!-- if Reward, pricing -->
-            {else if equal(:task.type, 'reward')}
-                <fieldset class="option-group option-short">
-                    <legend class="option-title">Price</legend>
-                    <input class="option-content" size="16" type="number" min="0" value={:task.value}>
-                    <div class="money input-suffix"><span class='shop_gold'></span></div>
-                </fieldset>
-
-
-            <!-- if Todo, the due date -->
-            {else if equal(:task.type, 'todo')}
-                <fieldset class="option-group">
-                    <legend class="option-title">Due Date</legend>
-                    <input class="option-content datepicker" type="text" value="{:task.date}" data-date-format="mm/dd/yyyy">
-                </fieldset>
-            {/}
-
-
-            {{#if @main}}<app:filters:filter-fieldgroup />{{/}}
-
-
-            <!-- Advanced Options -->
-            {#unless equal(:task.type, 'reward')}
-                <p x-bind="click:tasksToggleAdvanced" class="option-title mega">Advanced Options</p>
-                <fieldset class="option-group advanced-option visuallyhidden">
-                    <legend class="option-title"><a class='priority-multiplier-help' href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a> Difficulty</legend>
-
-                    {{#if taskInChallenge(:task)}}
-                        <button disabled type="button" class="task-action-btn tile active">
-                            {{taskAttrFromChallenge(:task,'priority')}}
-                        </button>
-                    {{else}}
-                        <div class="task-controls tile-group priority-multiplier" data-id="{{:task.id}}">
-                            <button type="button" class="task-action-btn tile {#if or(equal(:task.priority,'!'),not(:task.priority))}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
-                            <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
-                            <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>
-                        </div>
-                    {{/}}
-
-                    {{#if equal(:task.type,'daily')}}
-                        <legend class="option-title">Restore Streak</legend>
-                        <input class='option-content' type=number value="{int(:task.streak)}" />
-                    {{/}}
-                </fieldset>
-            {/}
-
-
-            <button type=submit class="task-action-btn tile spacious" x-bind="click:tasksSaveAndClose">Save & Close</button>
-        </form>
-    </div>
-
-    <div class="{#unless _page.charts[:task.id]}hidden{/} {{:task.id}}-chart"></div>
diff --git a/views/tasks/tasks.jade b/views/tasks/tasks.jade
deleted file mode 100644
index b957bab465..0000000000
--- a/views/tasks/tasks.jade
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-   Created by lefnire on 8/25/13.
-