diff --git a/src/content/theme/style.css b/src/content/theme/style.css
index c7df47f..336c413 100644
--- a/src/content/theme/style.css
+++ b/src/content/theme/style.css
@@ -770,8 +770,6 @@ li.task-row.task-expanded .task-note-block { display:block; }
 .task-note-actions { font-size:0.8rem; }
 .hidden { display:none; }
 .invisible { visibility:hidden; }
-.in500 { width:500px; color: var(--color-text-reduced); }
-.in100 { width:100px; color: var(--color-text-reduced); }
 .task-note a { color: var(--color-tasklist-note-link); }
 .task-note a:hover { color: var(--color-tasklist-link-hover) }
 
@@ -798,23 +796,43 @@ li.task-row.task-expanded .task-note-block { display:block; }
   text-align: center;
 }
 
-
-.form-row { margin-top:0.6rem; }
+.form-container {
+  display: flex;
+  flex-wrap: wrap;
+}
+.form-row {
+  margin-top:0.6rem;
+}
+.form-row-short {
+  margin-right:12px;
+}
+.form-row:not(.form-row-short) {
+  width:100%;
+}
 .form-row .h {
   font-weight:bold;
   color: var(--color-text-reduced);
 }
-.form-row div.h { margin-bottom:3px; }
-.form-row-short-end { clear:both; }
-#page_taskedit .form-row .in500 { width:100%; box-sizing:border-box; }
-#page_taskedit .form-row textarea.in500 {
-  height:300px;
+.form-row div.h {
+  margin-bottom:3px;
+}
+.form-input {
+  color: var(--color-text-reduced);
+}
+.form-input.in100 {
+  width:100px;
+}
+.form-input.inmax {
+  width:100%;
+  box-sizing:border-box;
+}
+textarea.form-input.inmax {
+  height:280px;
   font-size:13px;
   font-family: ui-monospace,Consolas,"SF Mono",Menlo,"Liberation Mono",monospace;
   white-space: pre;
   padding: 5px;
 }
-#page_taskedit .form-row-short { float:left; margin-right:12px; }
 .alltags-cell { width:1%; white-space:nowrap; padding-left:5px; }
 #page_taskedit.mtt-inadd .mtt-inedit { display:none; }
 #page_taskedit.mtt-inedit .mtt-inadd { display:none; }
@@ -1303,7 +1321,7 @@ li.mtt-item-hidden { display:none; }
     font-size: 16px;
     -webkit-text-size-adjust: 100%; /* Dont increase font-size in horizontal orientation on ios */
   }
-  #page_taskedit .form-row textarea.in500 { font-size: 14px; }
+  textarea.form-input.inmax { font-size: 14px; }
 }
 
 /* narrow screens */
@@ -1379,7 +1397,7 @@ li.mtt-item-hidden { display:none; }
 
   #page_taskedit { max-width:100%; border:none; position:static; padding:0; }
   #page_taskedit .form-table { width:100%; }
-  #page_taskedit .form-row textarea { height: 70px; }
+  #page_taskedit .form-row textarea { height: 150px; }
 
   #loading {  padding:0px; padding-top:1px; padding-right:1px; height:16px; overflow:hidden; }
 
diff --git a/src/content/theme/style_rtl.css b/src/content/theme/style_rtl.css
index 7176503..a6552f7 100644
--- a/src/content/theme/style_rtl.css
+++ b/src/content/theme/style_rtl.css
@@ -37,11 +37,9 @@ body { direction:rtl; }
 .duedate:before { content:'\20\2190\20'; }
 
 #tagcloud { box-shadow:-1px 2px 5px rgba(0,0,0,0.5); }
-#tagcloudcancel { float:left; }
 
 h3.page-title a.mtt-back-button { transform:rotate(180deg); }
-#taskedit-date { float:left; }
-#page_taskedit .form-row-short { float:right; margin-left:12px; margin-right:0; }
+.form-row-short { margin-left:12px; margin-right:0; }
 .alltags-cell { padding-left:0; padding-right:5px; }
 
 .mtt-menu-container { box-shadow:-1px 2px 5px rgba(0,0,0,0.5);  }
diff --git a/src/includes/theme.php b/src/includes/theme.php
index ac21d24..e5dff04 100644
--- a/src/includes/theme.php
+++ b/src/includes/theme.php
@@ -143,33 +143,45 @@ $().ready(function(){
 <form id="taskedit_form" name="edittask" method="post">
 <input type="hidden" name="isadd" value="0">
 <input type="hidden" name="id" value="">
+
+<div class="form-container">
 <div class="form-row form-row-short">
   <span class="h"><?php _e('priority');?></span>
   <select name="prio" class="form-input">
-    <option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">&plusmn;0</option><option value="-1">&minus;1</option>
+    <option value="2">+2</option>
+    <option value="1">+1</option>
+    <option value="0" selected="selected">&plusmn;0</option>
+    <option value="-1">&minus;1</option>
   </select>
 </div>
 <div class="form-row form-row-short">
   <span class="h"><?php _e('due');?> </span>
   <input name="duedate" id="duedate" value="" class="in100 form-input" title="Y-M-D, M/D/Y, D.M.Y, M/D, D.M" autocomplete="off" type="text">
 </div>
-<div class="form-row-short-end"></div>
-<div class="form-row"><div class="h"><?php _e('task');?></div> <input type="text" name="task" value="" class="in500 form-input" maxlength="250" autocomplete="off"></div>
-<div class="form-row"><div class="h"><?php _e('note');?></div> <textarea name="note" class="in500 form-input" spellcheck="false"></textarea></div>
-<div class="form-row"><div class="h"><?php _e('tags');?></div>
+<div class="form-row">
+  <div class="h"><?php _e('task');?></div>
+  <input type="text" name="task" value="" class="inmax form-input" maxlength="250" autocomplete="off">
+</div>
+<div class="form-row">
+  <div class="h"><?php _e('note');?></div>
+  <textarea name="note" class="inmax form-input" spellcheck="false"></textarea>
+</div>
+<div class="form-row">
+  <div class="h"><?php _e('tags');?></div>
   <table cellspacing="0" cellpadding="0" width="100%"><tr>
-    <td><input type="text" name="tags" id="edittags" value="" class="in500 form-input" maxlength="250" autocomplete="off"></td>
+    <td><input type="text" name="tags" id="edittags" value="" class="inmax form-input" maxlength="250" autocomplete="off"></td>
     <td class="alltags-cell">
       <a href="#" id="alltags_show"><?php _e('alltags_show');?></a>
       <a href="#" id="alltags_hide" style="display:none"><?php _e('alltags_hide');?></a>
-    </td>
-  </tr></table>
+    </td></tr>
+  </table>
 </div>
 <div class="form-row" id="alltags" style="display:none;"></div>
 <div class="form-row form-bottom-buttons">
   <button type="submit"><?php _e('save');?></button>
   <button class="mtt-back-button"><?php _e('cancel');?></button>
 </div>
+</div>
 </form>
 
 </div>