diff --git a/basicswap/http_server.py b/basicswap/http_server.py
index 26348c9..a4bc8db 100644
--- a/basicswap/http_server.py
+++ b/basicswap/http_server.py
@@ -701,25 +701,37 @@ class HttpHandler(BaseHTTPRequestHandler):
             try:
                 static_path = os.path.join(os.path.dirname(__file__), 'static')
 
-                if url_split[2] == 'favicon-32.png':
-                    self.putHeaders(status_code, 'image/png')
-                    with open(os.path.join(static_path, 'favicon-32.png'), 'rb') as fp:
+                if len(url_split) > 3 and url_split[2] == 'sequence_diagrams':
+                    with open(os.path.join(static_path, 'sequence_diagrams', url_split[3]), 'rb') as fp:
+                        self.putHeaders(status_code, 'image/svg+xml')
                         return fp.read()
-                elif url_split[2] == 'style.css':
-                    self.putHeaders(status_code, 'text/css')
-                    with open(os.path.join(static_path, 'style.css'), 'rb') as fp:
+                elif len(url_split) > 3 and url_split[2] == 'images':
+                    filename = os.path.join(*url_split[3:])
+                    _, extension = os.path.splitext(filename)
+                    mime_type = {'.svg': 'image/svg+xml',
+                                 '.png': 'image/png',
+                                 '.jpg': 'image/jpeg',
+                                }.get(extension, '')
+                    if mime_type == '':
+                        raise ValueError('Unknown file type ' + filename)
+                    with open(os.path.join(static_path, 'images', filename), 'rb') as fp:
+                        self.putHeaders(status_code, mime_type)
                         return fp.read()
-                elif len(url_split) > 3 and url_split[2] == 'sequence_diagrams':
-                    self.putHeaders(status_code, 'image/svg+xml')
-                    with open(os.path.join(static_path, 'sequence_diagrams', url_split[3]), 'rb') as fp:
+                elif len(url_split) > 3 and url_split[2] == 'css':
+                    filename = os.path.join(*url_split[3:])
+                    with open(os.path.join(static_path, 'css', filename), 'rb') as fp:
+                        self.putHeaders(status_code, 'text/css; charset=utf-8')
                         return fp.read()
                 else:
                     self.putHeaders(status_code, 'text/html')
                     return self.page_404(url_split)
-            except Exception as ex:
+            except FileNotFoundError:
                 self.putHeaders(status_code, 'text/html')
+                return self.page_404(url_split)
+            except Exception as ex:
                 if self.server.swap_client.debug is True:
                     self.server.swap_client.log.error(traceback.format_exc())
+                self.putHeaders(status_code, 'text/html')
                 return self.page_error(str(ex))
 
         try:
diff --git a/basicswap/static/style.css b/basicswap/static/css/simple/style.css
similarity index 100%
rename from basicswap/static/style.css
rename to basicswap/static/css/simple/style.css
diff --git a/basicswap/static/favicon-32.png b/basicswap/static/images/favicon-32.png
similarity index 100%
rename from basicswap/static/favicon-32.png
rename to basicswap/static/images/favicon-32.png
diff --git a/basicswap/templates/automation_strategies.html b/basicswap/templates/automation_strategies.html
index 3412c17..769a069 100644
--- a/basicswap/templates/automation_strategies.html
+++ b/basicswap/templates/automation_strategies.html
@@ -30,7 +30,7 @@
 <table>
 <tr><th>Name</th><th>Type</th></tr>
 {% for s in strategies %}
-<tr><td><a class="monospace" href=/automationstrategy/{{ s[0] }}>{{ s[1] }}</td><td>{{ s[2] }}</td></tr>
+<tr><td><a class="monospace" href=/automationstrategy/{{ s[0] }}>{{ s[1] }}</a></td><td>{{ s[2] }}</td></tr>
 {% endfor %}
 </table>
 
diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html
index 281b57d..4311018 100644
--- a/basicswap/templates/header.html
+++ b/basicswap/templates/header.html
@@ -4,8 +4,8 @@
 {% if refresh %}
 <meta http-equiv="refresh" content="{{ refresh }}">
 {% endif %}
-<link type="text/css" media="all" href="/static/style.css" rel="stylesheet">
-<link rel=icon sizes="32x32" type="image/png" href="/static/favicon-32.png">
+<link type="text/css" media="all" href="/static/css/simple/style.css" rel="stylesheet">
+<link rel=icon sizes="32x32" type="image/png" href="/static/images/favicon-32.png">
 <title>{{ title }}</title>
 </head>
 <body>
diff --git a/basicswap/templates/offer_confirm.html b/basicswap/templates/offer_confirm.html
index d3710dc..00b486b 100644
--- a/basicswap/templates/offer_confirm.html
+++ b/basicswap/templates/offer_confirm.html
@@ -60,8 +60,8 @@
 </select></td></tr>
 {% endif %}
 <tr><td>Rate</td><td><input type="text" id="rate" name="rate" value="{{ data.rate }}" readonly></td></tr>
-<tr><td>Amount Variable</td><td colspan=3><input type="checkbox" id="amt_var" name="amt_var_" value="av" {% if data.amt_var==true %} checked="true"{% endif %} disabled></td></tr>
-<tr><td>Rate Variable</td><td colspan=3><input type="checkbox" id="rate_var" name="rate_var_" value="rv" {% if data.rate_var==true %} checked="true"{% endif %} disabled></td></tr>
+<tr><td>Amount Variable</td><td colspan=3><input type="checkbox" id="amt_var" name="amt_var_" value="av" {% if data.amt_var==true %} checked=checked{% endif %} disabled></td></tr>
+<tr><td>Rate Variable</td><td colspan=3><input type="checkbox" id="rate_var" name="rate_var_" value="rv" {% if data.rate_var==true %} checked=checked{% endif %} disabled></td></tr>
 
 <tr class="padded_row"><td>Offer valid (hrs)</td><td><input type="number" name="validhrs" min="1" max="48" value="{{ data.validhrs }}" readonly></td></tr>
 {% if data.debug_ui == true %}
diff --git a/basicswap/templates/offer_new_1.html b/basicswap/templates/offer_new_1.html
index 9fb20ec..7083ce2 100644
--- a/basicswap/templates/offer_new_1.html
+++ b/basicswap/templates/offer_new_1.html
@@ -37,9 +37,9 @@
 </select>
 </td><td>Amount To</td><td><input type="text" id="amt_to" name="amt_to" value="{{ data.amt_to }}" onchange="set_rate('amt_to');"></td><td>The amount you will receive.</td></tr>
 
-<tr><td>Rate</td><td><input type="text" id="rate" name="rate" value="{{ data.rate }}" onchange="set_rate('rate');"></td><td>Lock Rate: <input type="checkbox" id="rate_lock" name="rate_lock" value="rl" checked="true"></td></tr>
-<tr><td>Amount Variable</td><td><input type="checkbox" id="amt_var" name="amt_var" value="av" {% if data.amt_var==true %} checked="true"{% endif %}></td></tr>
-<tr><td>Rate Variable</td><td><input type="checkbox" id="rate_var" name="rate_var" value="rv" {% if data.rate_var==true %} checked="true"{% endif %}></td></tr>
+<tr><td>Rate</td><td><input type="text" id="rate" name="rate" value="{{ data.rate }}" onchange="set_rate('rate');"></td><td>Lock Rate: <input type="checkbox" id="rate_lock" name="rate_lock" value="rl" checked=checked></td></tr>
+<tr><td>Amount Variable</td><td><input type="checkbox" id="amt_var" name="amt_var" value="av" {% if data.amt_var==true %} checked=checked{% endif %}></td></tr>
+<tr><td>Rate Variable</td><td><input type="checkbox" id="rate_var" name="rate_var" value="rv" {% if data.rate_var==true %} checked=checked{% endif %}></td></tr>
 </table>
 
 <input name="continue" type="submit" value="Continue">
diff --git a/basicswap/templates/offer_new_2.html b/basicswap/templates/offer_new_2.html
index de6023e..e3836a0 100644
--- a/basicswap/templates/offer_new_2.html
+++ b/basicswap/templates/offer_new_2.html
@@ -57,8 +57,8 @@
 </select></td></tr>
 {% endif %}
 <tr><td>Rate</td><td><input type="text" id="rate" name="rate" value="{{ data.rate }}" readonly></td></tr>
-<tr><td>Amount Variable</td><td colspan=3><input type="checkbox" id="amt_var" name="amt_var_" value="av" {% if data.amt_var==true %} checked="true"{% endif %} disabled></td></tr>
-<tr><td>Rate Variable</td><td colspan=3><input type="checkbox" id="rate_var" name="rate_var_" value="rv" {% if data.rate_var==true %} checked="true"{% endif %} disabled></td></tr>
+<tr><td>Amount Variable</td><td colspan=3><input type="checkbox" id="amt_var" name="amt_var_" value="av" {% if data.amt_var==true %} checked=checked{% endif %} disabled></td></tr>
+<tr><td>Rate Variable</td><td colspan=3><input type="checkbox" id="rate_var" name="rate_var_" value="rv" {% if data.rate_var==true %} checked=checked{% endif %} disabled></td></tr>
 
 
 <tr class="padded_row"><td>Offer valid (hrs)</td><td><input type="number" name="validhrs" min="1" max="48" value="{{ data.validhrs }}"></td></tr>
diff --git a/basicswap/templates/wallet.html b/basicswap/templates/wallet.html
index fd265bb..9b418a2 100644
--- a/basicswap/templates/wallet.html
+++ b/basicswap/templates/wallet.html
@@ -49,7 +49,7 @@
 {% else %}
 <tr><td><input type="submit" name="newaddr_{{ w.cid }}" value="New Deposit Address"></td><td colspan=2>{{ w.deposit_address }}</td></tr>
 {% endif %}
-<tr><td><input type="submit" name="withdraw_{{ w.cid }}" value="Withdraw" onclick="return confirmWithdrawal();"></td><td>Amount: <input type="text" name="amt_{{ w.cid }}" value="{{ w.wd_value }}"></td><td>Address: <input type="text" name="to_{{ w.cid }}" value="{{ w.wd_address }}"></td><td>Subtract fee: <input type="checkbox" name="subfee_{{ w.cid }}" {% if w.wd_subfee==true %} checked="true"{% endif %}></td></tr>
+<tr><td><input type="submit" name="withdraw_{{ w.cid }}" value="Withdraw" onclick="return confirmWithdrawal();"></td><td>Amount: <input type="text" name="amt_{{ w.cid }}" value="{{ w.wd_value }}"></td><td>Address: <input type="text" name="to_{{ w.cid }}" value="{{ w.wd_address }}"></td><td>Subtract fee: <input type="checkbox" name="subfee_{{ w.cid }}" {% if w.wd_subfee==true %} checked=checked{% endif %}></td></tr>
 {% if w.cid == '1' %}
 <tr><td>Type From, To</td><td>
 <select name="withdraw_type_from_{{ w.cid }}">