diff --git a/views/app/index.html b/views/app/index.html
index 359f325817..69ce9f1db5 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -1,11 +1,11 @@
 <import: src="modals">
-<import: src="alerts">
-<import: src="settings">
-<import: src="rewards">
-<import: src="tasks">
+<import: src="tasks" ns="">
 <import: src="header">
+<import: src="alerts">
 <import: src="avatar">
+<import: src="rewards" ns="">
 <import: src="footer">
+<import: src="settings">
 <import: src="party">
 
 <Title:>
@@ -31,7 +31,7 @@
   <div id=wrap class="container-fluid">
     <app:alerts:alerts />
     <div id=main class="row-fluid">
-      <app:tasks:taskLists />
+      <app:taskLists />
     </div>
   </div>
   
diff --git a/views/app/modals.html b/views/app/modals.html
index aa6d010a1d..5b0b26792f 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -17,7 +17,7 @@
 
     <!-- Re-Roll modal -->
     <app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
-        <app:rewards:userTokens/>
+        <app:userTokens/>
         <p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
         <@footer>
             {#if lt(_user.balance,1)}
@@ -30,7 +30,7 @@
 
     <!-- Buy more tokens modal -->
     <app:modals:modal modalId='more-tokens-modal' header="Out Of Tokens">
-        <app:rewards:userTokens/>
+        <app:userTokens/>
         <p>You're out of tokens, which are used to buy pets and mounts.</p>
         <@footer>
         <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Tokens</a><span class='token-cost'>Not enough tokens</span>
diff --git a/views/app/rewards.html b/views/app/rewards.html
index 673db54571..e7e1bd29e9 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -1,17 +1,17 @@
 <rewardsTab:>
     <ul class='rewards'>
-        {#each _rewardList as :task}<app:tasks:task />{/}
+        {#each _rewardList as :task}<app:task />{/}
     </ul>
 
 
     {#if _user.flags.itemsEnabled}
     <ul class='items'>
-        {#with _view.items.weapon as :item}<app:rewards:item />{/}
-        {#with _view.items.armor as :item}<app:rewards:item />{/}
-        {#with _view.items.head as :item}<app:rewards:item />{/}
-        {#with _view.items.shield as :item}<app:rewards:item />{/}
-        {#with _view.items.potion as :item}<app:rewards:item />{/}
-        {#with _view.items.reroll as :item}<app:rewards:item reroll=true />{/}
+        {#with _view.items.weapon as :item}<app:item />{/}
+        {#with _view.items.armor as :item}<app:item />{/}
+        {#with _view.items.head as :item}<app:item />{/}
+        {#with _view.items.shield as :item}<app:item />{/}
+        {#with _view.items.potion as :item}<app:item />{/}
+        {#with _view.items.reroll as :item}<app:item reroll=true />{/}
     </ul>
     {/}
 
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 68f83d0f2f..f0ff20c787 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -2,23 +2,23 @@
     <!--helpTitle & helpContent moved to tour -->
     <div class="task-column span3 habits">
         <h2>Habits</h2>
-        <app:tasks:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
-        <ul class="habits">{#each _habitList as :task}<app:tasks:task />{/}</ul>
+        <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
+        <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
     </div>
 
     <div class="task-column span3 dailys">
         <h2>Daily</h2>
-        <app:tasks:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
-        <ul class='dailys'>{#each _dailyList as :task}<app:tasks:task />{/}</ul>
+        <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
+        <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
     </div>
 
     <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">
-            <app:tasks:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
+            <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
         </div>
         <ul class='todos task-list'>
-            {#each _todoList as :task}<app:tasks:task />{/}
+            {#each _todoList as :task}<app:task />{/}
         </ul>
         <div class="display-context-dependant show-for-completed">
             <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
@@ -55,120 +55,120 @@
                     <td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
                 </tr></table>
                 {else}
-                <app:rewards:userTokens />
+                <app:userTokens />
                 {/}
             </div>
         </div>
-        <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+        <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
-        {#if equal(_user.flags.petsEnabled,true)}
-            <div class='tabbable tabs-below'>
+        {#if _user.flags.petsEnabled}
+        <div class='tabbable tabs-below'>
 
-                <div class="tab-content">
-                    <div class="tab-pane active" id="rewards-tab">
-                        <app:rewards:rewardsTab />
-                    </div>
-
-                    <div class="tab-pane" id="pets-tab">
-                        {#with _view.items.pets as :pets}
-
-                        <div class="row-fluid">
-                            {#with :pets[0]}<app:rewards:pet />{/}
-                            {#with :pets[1]}<app:rewards:pet />{/}
-                            {#with :pets[2]}<app:rewards:pet />{/}
-                            {#with :pets[3]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[4]}<app:rewards:pet />{/}
-                            {#with :pets[5]}<app:rewards:pet />{/}
-                            {#with :pets[6]}<app:rewards:pet />{/}
-                            {#with :pets[7]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[8]}<app:rewards:pet />{/}
-                            {#with :pets[9]}<app:rewards:pet />{/}
-                            {#with :pets[10]}<app:rewards:pet />{/}
-                            {#with :pets[11]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[12]}<app:rewards:pet />{/}
-                            {#with :pets[13]}<app:rewards:pet />{/}
-                            {#with :pets[14]}<app:rewards:pet />{/}
-                            {#with :pets[15]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[16]}<app:rewards:pet />{/}
-                        </div>
-
-
-                        {/}
-                    </div>
-                    <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+            <div class="tab-content">
+                <div class="tab-pane active" id="rewards-tab">
+                    <app:rewardsTab />
                 </div>
 
+                <div class="tab-pane" id="pets-tab">
+                    {#with _view.items.pets as :pets}
 
-                <ul class="nav nav-tabs" id="rewardsTabs">
-                    <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                    <li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
-                    <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
-                </ul>
+                    <div class="row-fluid">
+                        {#with :pets[0]}<app:pet />{/}
+                        {#with :pets[1]}<app:pet />{/}
+                        {#with :pets[2]}<app:pet />{/}
+                        {#with :pets[3]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[4]}<app:pet />{/}
+                        {#with :pets[5]}<app:pet />{/}
+                        {#with :pets[6]}<app:pet />{/}
+                        {#with :pets[7]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[8]}<app:pet />{/}
+                        {#with :pets[9]}<app:pet />{/}
+                        {#with :pets[10]}<app:pet />{/}
+                        {#with :pets[11]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[12]}<app:pet />{/}
+                        {#with :pets[13]}<app:pet />{/}
+                        {#with :pets[14]}<app:pet />{/}
+                        {#with :pets[15]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[16]}<app:pet />{/}
+                    </div>
+
+
+                    {/}
+                </div>
+                <!--<div class="tab-pane" id="mounts-tab">...</div>-->
             </div>
-        {else}
-            <app:rewards:rewardsTab />
-        {/}
+
+
+            <ul class="nav nav-tabs" id="rewardsTabs">
+                <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
+                <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+            </ul>
+        </div>
+    {else}
+        <app:rewardsTab />
+    {/}
     </div>
 
 <newTask:>
-    <form class="addtask-form form-inline new-task-form" id="new-{{@type}}" data-task-type="{{@type}}" x-bind="submit:addTask">
-        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{{@placeHolder}}"/>
+    <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
+        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
         <input class="btn addtask-btn" type="submit" value="Add">
     </form>
 
-<!-- all the parts of a single task -->
-<task:>
-    <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-        <!-- right-hand side control buttons -->
-        <div class="task-meta-controls">
-            <div class="hover-show">
-                <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                {#if :task.history}
-                <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                    <i class="icon-signal"></i>
-                </a>
+    <!-- all the parts of a single task -->
+    <task:>
+        <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+            <!-- right-hand side control buttons -->
+            <div class="task-meta-controls">
+                <div class="hover-show">
+                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                    {#if :task.history}
+                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                        <i class="icon-signal"></i>
+                    </a>
+                    {/}
+                </div>
+
+                {#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>
 
-            {#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">
+                <!-- Habits -->
+                {#if equal(:task.type, 'habit')}
+                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+                <!-- Rewards -->
+                {else if equal(:task.type, 'reward')}
+                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+                <!-- Daily & Todos -->
+                {else}
+                <input type=checkbox checked="{:task.completed}">
+                {/}
+            </div>
 
-        <!-- left-hand side checkbox -->
-        <div class="task-controls">
-            <!-- Habits -->
-            {#if equal(:task.type, 'habit')}
-            {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-            {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-            <!-- Rewards -->
-            {else if equal(:task.type, 'reward')}
-            <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-            <!-- Daily & Todos -->
-            {else}
-            <input type=checkbox checked="{:task.completed}">
-            {/}
-        </div>
+            <!-- main content -->
+            <div class="task-text">{:task.text}</div>
 
-        <!-- main content -->
-        <div class="task-text">{:task.text}</div>
-
-        <!-- edit/options dialog -->
-        <app:tasks:taskMeta />
-    </li>
+            <!-- edit/options dialog -->
+            <app:taskMeta />
+        </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>