diff --git a/site/style.css b/site/style.css
index ff27654..52f442b 100644
--- a/site/style.css
+++ b/site/style.css
@@ -69,13 +69,24 @@ table.history p.linked-credit {
     font-size: smaller;
 }
 
-dl dd + dt {
-    border-top: 1px solid lightgrey;
-    margin-top: 1em;
+input, textarea {
+    border: 1px solid #ddd;
+}
+
+dl dt {
+  float: left;
+  clear: left;
+  width: 7em;
+  text-align: right;
+  font-weight: bold;
+}
+dl dd {
+  margin: 0 0 0 8em;
+  padding: 0 0 0.5em 0;
 }
 
 select {
-    border:none;
+    border: 1px solid #ddd;
     background-color:transparent;
 }
 
diff --git a/templates/credit/upsert.html.ep b/templates/credit/upsert.html.ep
index e12d894..19f234c 100644
--- a/templates/credit/upsert.html.ep
+++ b/templates/credit/upsert.html.ep
@@ -9,7 +9,7 @@
     <input id="date" name="date" value="<%= $credit->date %>"> (Format: YYYY-MM-DD)
 % end
 % $r{purpose} = begin
-    <input id="purpose" name="purpose" style="width:100%" value="<%= $credit->purpose %>">
+    <textarea id="purpose" name="purpose" style="width:100%"><%= $credit->purpose %></textarea>
 % end
 % $r{category} = begin
 %    my $category = $credit->category // '';
@@ -26,7 +26,7 @@
     <input id="value" name="value" value="<%= $credit->value %>"> Cent (declare target credit with "0")
 % end
 % $r{account} = begin
-    <input id="account" name="account" value="<%= $credit->account->ID %>">
+    <%= $credit->account->ID %>
 % end
 
 <dl class="upsert">
@@ -72,11 +72,10 @@
 % if ( $account //= $credit->account ) {
 <h2>Spend for arrears</h2>
 %    my $arrears = ( ref $account ? $account : app->db->resultset("Account")->find($account) )->current_arrears;
-%    if ( $arrears->first() ) {
-<p><%= $credit->value == $credit->spent ? "The credit is already spent. Unless you revoke any outgoings above, there is no point in checking" : "Check" %> <%= %paid_debits ? "other" : "" %> debits you want to <strong>spend this credit</strong> for:</p>
-<p>Check arrears you want to <strong>use this credit</strong> for.</p>
+%    if ( $arrears->count() ) {
+<p><%= $credit->value && $credit->value == $credit->spent ? "The credit is already spent. Unless you revoke any outgoings above, there is no point in checking" : "Check" %> <%= %paid_debits ? "other" : "" %> debits you want to <strong>spend this credit</strong> for:</p>
 <table>
-<tr><th>S</th><th>date</th><th>purpose</th><th>to pay</th></tr>
+<tr><th>S</th><th>date</th><th>purpose</th><th>to pay</th><th>note</th></tr>
 %        while ( my $d = $arrears->next ) {
 %            next if $paid_debits{ $d->billId };
 <tr><td><input type="checkbox" name="spendFor" value="<%= $d->billId %>"></td>
diff --git a/templates/debit/upsert.html.ep b/templates/debit/upsert.html.ep
index dd56102..8779fd5 100644
--- a/templates/debit/upsert.html.ep
+++ b/templates/debit/upsert.html.ep
@@ -12,7 +12,7 @@
     <input id="date" name="date" value="<%= $debit->date %>"> (Format: YYYY-MM-DD)
 % end
 % $r{purpose} = begin
-    <input id="purpose" name="purpose" style="width:100%" value="<%= $debit->purpose %>">
+    <textarea id="purpose" name="purpose" style="width:100%"><%= $debit->purpose %></textarea>
 % end
 % $r{category} = begin
 %    my $category = $debit->category // '';
@@ -102,8 +102,8 @@ oops
 % if ( $account ||= $debit->debtor ) {
 <h2>Pay with credits</h2>
 %    my $credits = app->db->resultset("Account")->find($account)->available_credits;
-%    if ( $credits->first() ) {
-<p><%= $debit->value == $debit->value ? "The debt is already settled. Unless you revoke any incomings above, there is no point in checking" : "Check" %> <%= %used_credits ? "other" : "" %> credits you want to <strong>pay this debit</strong> with:</p>
+%    if ( $credits->count() ) {
+<p><%= $debit->value && $debit->value == $debit->value ? "The debt is already settled. Unless you revoke any incomings above, there is no point in checking" : "Check" %> <%= %used_credits ? "other" : "" %> credits you want to <strong>pay this debit</strong> with:</p>
 <table>
 <tr><th>S</th><th>date</th><th>purpose</th><th>to spend</th><th>note</th></tr>
 %        while ( my $c = $credits->next ) {