diff --git a/budget/static/bootstrap.min.css b/budget/static/css/bootstrap.min.css
similarity index 100%
rename from budget/static/bootstrap.min.css
rename to budget/static/css/bootstrap.min.css
diff --git a/budget/static/delete.png b/budget/static/css/images/delete.png
similarity index 100%
rename from budget/static/delete.png
rename to budget/static/css/images/delete.png
diff --git a/budget/static/deleter.png b/budget/static/css/images/deleter.png
similarity index 100%
rename from budget/static/deleter.png
rename to budget/static/css/images/deleter.png
diff --git a/budget/static/edit.png b/budget/static/css/images/edit.png
similarity index 100%
rename from budget/static/edit.png
rename to budget/static/css/images/edit.png
diff --git a/budget/static/gradient.png b/budget/static/css/images/gradient.png
similarity index 100%
rename from budget/static/gradient.png
rename to budget/static/css/images/gradient.png
diff --git a/budget/static/reactivate.png b/budget/static/css/images/reactivate.png
similarity index 100%
rename from budget/static/reactivate.png
rename to budget/static/css/images/reactivate.png
diff --git a/budget/static/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/budget/static/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to budget/static/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/budget/static/jquery/images/ui-bg_flat_0_eeeeee_40x100.png b/budget/static/css/images/ui-bg_flat_0_eeeeee_40x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_flat_0_eeeeee_40x100.png
rename to budget/static/css/images/ui-bg_flat_0_eeeeee_40x100.png
diff --git a/budget/static/jquery/images/ui-bg_flat_55_ffffff_40x100.png b/budget/static/css/images/ui-bg_flat_55_ffffff_40x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_flat_55_ffffff_40x100.png
rename to budget/static/css/images/ui-bg_flat_55_ffffff_40x100.png
diff --git a/budget/static/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/budget/static/css/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_flat_75_ffffff_40x100.png
rename to budget/static/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/budget/static/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/budget/static/css/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_glass_65_ffffff_1x400.png
rename to budget/static/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/budget/static/jquery/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png b/budget/static/css/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
rename to budget/static/css/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
diff --git a/budget/static/jquery/images/ui-bg_highlight-soft_25_0073ea_1x100.png b/budget/static/css/images/ui-bg_highlight-soft_25_0073ea_1x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_highlight-soft_25_0073ea_1x100.png
rename to budget/static/css/images/ui-bg_highlight-soft_25_0073ea_1x100.png
diff --git a/budget/static/jquery/images/ui-bg_highlight-soft_50_dddddd_1x100.png b/budget/static/css/images/ui-bg_highlight-soft_50_dddddd_1x100.png
similarity index 100%
rename from budget/static/jquery/images/ui-bg_highlight-soft_50_dddddd_1x100.png
rename to budget/static/css/images/ui-bg_highlight-soft_50_dddddd_1x100.png
diff --git a/budget/static/jquery/images/ui-icons_0073ea_256x240.png b/budget/static/css/images/ui-icons_0073ea_256x240.png
similarity index 100%
rename from budget/static/jquery/images/ui-icons_0073ea_256x240.png
rename to budget/static/css/images/ui-icons_0073ea_256x240.png
diff --git a/budget/static/jquery/images/ui-icons_454545_256x240.png b/budget/static/css/images/ui-icons_454545_256x240.png
similarity index 100%
rename from budget/static/jquery/images/ui-icons_454545_256x240.png
rename to budget/static/css/images/ui-icons_454545_256x240.png
diff --git a/budget/static/jquery/images/ui-icons_666666_256x240.png b/budget/static/css/images/ui-icons_666666_256x240.png
similarity index 100%
rename from budget/static/jquery/images/ui-icons_666666_256x240.png
rename to budget/static/css/images/ui-icons_666666_256x240.png
diff --git a/budget/static/jquery/images/ui-icons_ff0084_256x240.png b/budget/static/css/images/ui-icons_ff0084_256x240.png
similarity index 100%
rename from budget/static/jquery/images/ui-icons_ff0084_256x240.png
rename to budget/static/css/images/ui-icons_ff0084_256x240.png
diff --git a/budget/static/jquery/images/ui-icons_ffffff_256x240.png b/budget/static/css/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from budget/static/jquery/images/ui-icons_ffffff_256x240.png
rename to budget/static/css/images/ui-icons_ffffff_256x240.png
diff --git a/budget/static/jquery/jquery-ui.css b/budget/static/css/jquery-ui.css
similarity index 100%
rename from budget/static/jquery/jquery-ui.css
rename to budget/static/css/jquery-ui.css
diff --git a/budget/static/main.css b/budget/static/css/main.css
similarity index 87%
rename from budget/static/main.css
rename to budget/static/css/main.css
index ba950db..b300448 100644
--- a/budget/static/main.css
+++ b/budget/static/css/main.css
@@ -1,6 +1,6 @@
 @import "bootstrap.min.css";
 @import url(http://fonts.googleapis.com/css?family=Lobster|Comfortaa);
-@import "jquery/jquery-ui.css";
+@import "jquery-ui.css";
 
 html, body{
     margin-top: 25px;
@@ -48,7 +48,7 @@ div.topbar ul.secondary-nav { padding-right: 75px; }
     font-family: 'Comfortaa', arial, serif;
     height: 165px;
     padding-top: 15px;
-    background-image: url("gradient.png");
+    background-image: url("images/gradient.png");
     background-position: center top;
     background-repeat: no-repeat;
 }
@@ -135,9 +135,22 @@ div.topbar ul.secondary-nav { padding-right: 75px; }
     text-align: center;
 }
 
-.edit img, .delete img{
+.bill-actions > .delete, .bill-actions > .edit {
+    font-size: 0px;
+    display: block;
+    width: 16px;
     height: 16px;
-    margin-right: 5px;
+    margin: 2px;
+    margin-left: 5px;
+    float: left;
+}
+
+.bill-actions > .delete{
+    background: url('images/delete.png') no-repeat right;
+}
+
+.bill-actions > .edit{
+    background: url('images/edit.png') no-repeat right;
 }
 
 .balance-value{
@@ -174,12 +187,12 @@ tr.payer_line .balance-name{
 }
 
 .delete a, .delete a:hover {
-    background: url('deleter.png') left no-repeat;
+    background: url('images/deleter.png') left no-repeat;
     color: red;
 }
 
 .reactivate a, .reactivate a:hover {
-    background: url('reactivate.png') left no-repeat;
+    background: url('images/reactivate.png') left no-repeat;
     color: white;
 }
 
diff --git a/budget/static/jquery/i18n/jquery.ui.datepicker-fr.js b/budget/static/js/i18n/jquery.ui.datepicker-fr.js
similarity index 100%
rename from budget/static/jquery/i18n/jquery.ui.datepicker-fr.js
rename to budget/static/js/i18n/jquery.ui.datepicker-fr.js
diff --git a/budget/static/ihatemoney/custom.js b/budget/static/js/ihatemoney.js
similarity index 100%
rename from budget/static/ihatemoney/custom.js
rename to budget/static/js/ihatemoney.js
diff --git a/budget/static/jquery/js/jquery-1.6.2.min.js b/budget/static/js/jquery-1.6.2.min.js
similarity index 100%
rename from budget/static/jquery/js/jquery-1.6.2.min.js
rename to budget/static/js/jquery-1.6.2.min.js
diff --git a/budget/static/jquery/js/jquery-ui.js b/budget/static/js/jquery-ui.js
similarity index 100%
rename from budget/static/jquery/js/jquery-ui.js
rename to budget/static/js/jquery-ui.js
diff --git a/budget/templates/add_bill.html b/budget/templates/add_bill.html
index b784bfd..34b89cc 100644
--- a/budget/templates/add_bill.html
+++ b/budget/templates/add_bill.html
@@ -1,11 +1,10 @@
 {% extends "layout.html" %}
 
 {% block head %}
-    <script src="{{ url_for("static", filename="jquery/js/jquery-ui.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/jquery-ui.js") }}"></script>
     {% if g.lang != "en" %}
-    <script src="{{ url_for("static", filename="jquery/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
+    <script src="{{ url_for("static", filename="js/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
     {% endif %}
-    <script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
 {% endblock %}
 {% block js %}
     $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
diff --git a/budget/templates/add_member.html b/budget/templates/add_member.html
index 9577ac2..91ca226 100644
--- a/budget/templates/add_member.html
+++ b/budget/templates/add_member.html
@@ -1,7 +1,4 @@
 {% extends "layout.html" %}
-{% block head %}
-	<script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
-{% endblock %}
 {% block js %}
     auto_hide_default_text('#name');
 {% endblock %}
diff --git a/budget/templates/layout.html b/budget/templates/layout.html
index bd02435..ab1f45d 100644
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@@ -4,8 +4,9 @@
 <head>
     <title>{{ _("Account manager") }}{% block title %}{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <link rel=stylesheet type=text/css href="{{ url_for("static", filename='main.css') }}">
-    <script src="{{ url_for("static", filename="jquery/js/jquery-1.6.2.min.js") }}"></script>
+    <link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/main.css') }}">
+    <script src="{{ url_for("static", filename="js/jquery-1.6.2.min.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/ihatemoney.js") }}"></script>
     {% block head %}{% endblock %}
     <script type="text/javascript" charset="utf-8">
         $(document).ready(function(){
diff --git a/budget/templates/layout.txt b/budget/templates/layout.txt
deleted file mode 100644
index c6afe66..0000000
--- a/budget/templates/layout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{% block content %}
-{% endblock %}
\ No newline at end of file
diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index 8751e31..c6eeb02 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -2,11 +2,10 @@
 
 {% block title %}- {{ g.project.name }}{% endblock %}
 {% block head %}
-    <script src="{{ url_for("static", filename="jquery/js/jquery-ui.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/jquery-ui.js") }}"></script>
     {% if g.lang != "en" %}
-    <script src="{{ url_for("static", filename="jquery/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
+    <script src="{{ url_for("static", filename="js/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
     {% endif %}
-    <script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
 {% endblock %}
 {% block js %}