diff --git a/public/templates/directives/track-editor.html b/public/templates/directives/track-editor.html
index 0cacf826..155830ef 100644
--- a/public/templates/directives/track-editor.html
+++ b/public/templates/directives/track-editor.html
@@ -1,4 +1,4 @@
-<form novalidate ng-submit="updateTrack(track)">
+<form class="track-editor" novalidate ng-submit="updateTrack(track)">
     <ul class="toolbar">
         <li>
             <button type="submit" class="btn" ng-class="{disabled: (track.is_published && !isDirty) || isSaving, 'btn-primary': !track.is_published || isDirty}">
diff --git a/resources/assets/styles/account-content.less b/resources/assets/styles/account-content.less
index fa86a0d5..580f9593 100644
--- a/resources/assets/styles/account-content.less
+++ b/resources/assets/styles/account-content.less
@@ -227,120 +227,10 @@ html {
   }
 }
 
+// Used in the Accounts > Tracks area
 .two-pane-view {
-  .list {
-    .dropdowns {
-      margin-top: 0px;
-    }
-  }
-
   .editor {
     display: none;
-
-    .album-track-listing {
-      padding: 0px;
-      clear: both;
-      margin: 0px;
-      margin-top: 10px;
-      list-style: none;
-
-      li {
-        overflow: hidden;
-        line-height: normal;
-        padding: 0px;
-        margin: 0px;
-        font-size: 8pt;
-        border-bottom: 1px dashed #ddd;
-
-        div {
-          padding: 2px;
-        }
-
-        span {
-          display: block;
-          float: left;
-          margin-left: 5px;
-          margin-top: 2px;
-        }
-
-        .btn {
-          line-height: normal;
-          padding: 2px 5px;
-          margin: 0px;
-        }
-
-        &.ui-sortable-helper {
-          #gradient>.vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
-          border: none;
-          color: #fff;
-        }
-
-        &.ui-sortable-placeholder {
-          background: @yellow;
-        }
-      }
-    }
-
-    .show-songs, .album {
-      .btn {
-        display: block;
-        float: none;
-      }
-    }
-
-    .show-songs, .album, .track-selector {
-      .btn {
-        .border-radius(0px);
-        padding: 3px 10px;
-        font-size: 8pt;
-        text-align: left;
-      }
-
-      .error {
-        margin-top: 10px;
-      }
-
-      .pfm-popup {
-        width: 300px;
-
-        ul {
-          margin: 0px;
-          padding: 0px;
-          list-style: none;
-
-          li {
-            margin: 0px;
-            padding: 0px;
-
-            a {
-              .ellipsis();
-              display: block;
-              padding: 3px 10px;
-              font-size: 8pt;
-              color: #333333;
-
-              &:hover {
-                #gradient>.vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
-                text-decoration: none;
-                color: @dropdownLinkColorHover;
-              }
-            }
-
-            &.selected {
-              a {
-                #gradient>.vertical(@green, darken(@green, 5%));
-                color: #fff;
-                font-weight: bold;
-
-                &:hover {
-                  #gradient>.vertical(fadeout(@green, 20%), fadeout(darken(@green, 5%), 20%));
-                }
-              }
-            }
-          }
-        }
-      }
-    }
   }
 
   &.closed {
@@ -376,61 +266,3 @@ html {
     }
   }
 }
-
-.license-grid {
-  margin: 0px;
-  padding: 0px;
-  overflow: hidden;
-  list-style: none;
-
-  li {
-    float: left;
-    width: 25%;
-
-    > div {
-      margin: 0px 5px;
-      border: 1px solid #ddd;
-      padding: 10px;
-      cursor: pointer;
-
-      strong {
-        font-size: 9pt;
-        display: block;
-        margin: 0px;
-        margin-bottom: 5px;
-        padding: 0px;
-        line-height: normal;
-      }
-    }
-
-    p {
-      min-height: 120px;
-      font-size: 9pt;
-    }
-
-    a {
-      .border-radius(0px);
-      display: block;
-      width: auto;
-    }
-
-    &.selected {
-      > div {
-        cursor: default;
-        border-color: @blue;
-      }
-    }
-
-    &:hover > div {
-      border: 1px solid #3366CC;
-    }
-
-    &:first-child > div {
-      margin-left: 0px;
-    }
-
-    &:last-child > div {
-      margin-right: 0px;
-    }
-  }
-}
diff --git a/resources/assets/styles/app.less b/resources/assets/styles/app.less
index 33c7095c..2cee70af 100644
--- a/resources/assets/styles/app.less
+++ b/resources/assets/styles/app.less
@@ -24,12 +24,13 @@
 @import 'layout';
 @import 'account-content';
 @import 'admin';
-@import 'components';
+@import 'components/components';
 @import 'forms';
 @import 'animations';
 @import 'body';
-@import 'player';
+@import 'components/player';
 @import 'content';
 @import 'dashboard';
-@import 'uploader';
-@import 'search';
+@import 'components/uploader';
+@import 'components/search';
+@import 'components/track-editor';
diff --git a/resources/assets/styles/components.less b/resources/assets/styles/components/components.less
similarity index 98%
rename from resources/assets/styles/components.less
rename to resources/assets/styles/components/components.less
index 9a76c6d7..4976e753 100644
--- a/resources/assets/styles/components.less
+++ b/resources/assets/styles/components/components.less
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import 'base/bootstrap/bootstrap';
-@import 'mixins';
-@import 'variables';
+@import '../base/bootstrap/bootstrap';
+@import '../mixins';
+@import '../variables';
 
 .stretch-to-bottom {
   overflow-y: auto;
diff --git a/resources/assets/styles/player.less b/resources/assets/styles/components/player.less
similarity index 98%
rename from resources/assets/styles/player.less
rename to resources/assets/styles/components/player.less
index 84d853c4..f1b78f5a 100644
--- a/resources/assets/styles/player.less
+++ b/resources/assets/styles/components/player.less
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import 'variables';
-@import 'mixins';
+@import '../variables';
+@import '../mixins';
 
 body.is-logged {
   .track-player {
diff --git a/resources/assets/styles/search.less b/resources/assets/styles/components/search.less
similarity index 94%
rename from resources/assets/styles/search.less
rename to resources/assets/styles/components/search.less
index b29d398a..8a647f13 100644
--- a/resources/assets/styles/search.less
+++ b/resources/assets/styles/components/search.less
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import 'base/bootstrap/bootstrap';
-@import 'mixins';
-@import 'variables';
+@import '../base/bootstrap/bootstrap';
+@import '../mixins';
+@import '../variables';
 
 .search {
   position: relative;
diff --git a/resources/assets/styles/components/track-editor.less b/resources/assets/styles/components/track-editor.less
new file mode 100644
index 00000000..24c498a9
--- /dev/null
+++ b/resources/assets/styles/components/track-editor.less
@@ -0,0 +1,192 @@
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2016 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import '../base/bootstrap/bootstrap';
+@import '../mixins';
+
+
+.track-editor {
+  .list {
+    .dropdowns {
+      margin-top: 0px;
+    }
+  }
+
+  .album-track-listing {
+    padding: 0px;
+    clear: both;
+    margin: 0px;
+    margin-top: 10px;
+    list-style: none;
+
+    li {
+      overflow: hidden;
+      line-height: normal;
+      padding: 0px;
+      margin: 0px;
+      font-size: 8pt;
+      border-bottom: 1px dashed #ddd;
+
+      div {
+        padding: 2px;
+      }
+
+      span {
+        display: block;
+        float: left;
+        margin-left: 5px;
+        margin-top: 2px;
+      }
+
+      .btn {
+        line-height: normal;
+        padding: 2px 5px;
+        margin: 0px;
+      }
+
+      &.ui-sortable-helper {
+        #gradient> .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
+        border: none;
+        color: #fff;
+      }
+
+      &.ui-sortable-placeholder {
+        background: @yellow;
+      }
+    }
+  }
+
+  .show-songs, .album {
+    .btn {
+      display: block;
+      float: none;
+    }
+  }
+
+  .show-songs, .album, .track-selector {
+    .btn {
+      .border-radius(0px);
+      padding: 3px 10px;
+      font-size: 8pt;
+      text-align: left;
+    }
+
+    .error {
+      margin-top: 10px;
+    }
+
+    .pfm-popup {
+      width: 300px;
+
+      ul {
+        margin: 0px;
+        padding: 0px;
+        list-style: none;
+
+        li {
+          margin: 0px;
+          padding: 0px;
+
+          a {
+            .ellipsis();
+            display: block;
+            padding: 3px 10px;
+            font-size: 8pt;
+            color: #333333;
+
+            &:hover {
+              #gradient> .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
+              text-decoration: none;
+              color: @dropdownLinkColorHover;
+            }
+          }
+
+          &.selected {
+            a {
+              #gradient> .vertical(@green, darken(@green, 5%));
+              color: #fff;
+              font-weight: bold;
+
+              &:hover {
+                #gradient> .vertical(fadeout(@green, 20%), fadeout(darken(@green, 5%), 20%));
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.license-grid {
+  margin: 0px;
+  padding: 0px;
+  overflow: hidden;
+  list-style: none;
+
+  li {
+    float: left;
+    width: 25%;
+
+    > div {
+      margin: 0px 5px;
+      border: 1px solid #ddd;
+      padding: 10px;
+      cursor: pointer;
+
+      strong {
+        font-size: 9pt;
+        display: block;
+        margin: 0px;
+        margin-bottom: 5px;
+        padding: 0px;
+        line-height: normal;
+      }
+    }
+
+    p {
+      min-height: 120px;
+      font-size: 9pt;
+    }
+
+    a {
+      .border-radius(0px);
+      display: block;
+      width: auto;
+    }
+
+    &.selected {
+      > div {
+        cursor: default;
+        border-color: @blue;
+      }
+    }
+
+    &:hover > div {
+      border: 1px solid #3366CC;
+    }
+
+    &:first-child > div {
+      margin-left: 0px;
+    }
+
+    &:last-child > div {
+      margin-right: 0px;
+    }
+  }
+}
diff --git a/resources/assets/styles/uploader.less b/resources/assets/styles/components/uploader.less
similarity index 98%
rename from resources/assets/styles/uploader.less
rename to resources/assets/styles/components/uploader.less
index 6b68691b..4a0d3ca2 100644
--- a/resources/assets/styles/uploader.less
+++ b/resources/assets/styles/components/uploader.less
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import 'variables';
+@import '../variables';
 
 .uploader {
   h1 {