diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss
index 3f95e0a..dd09b6a 100644
--- a/view-webapp/src/main/sass/main.scss
+++ b/view-webapp/src/main/sass/main.scss
@@ -35,6 +35,13 @@
     text-align: center;
   }
 
+  .note {
+    padding-left: 0.5em;
+    font-size: 0.8em;
+    font-weight: normal;
+    font-style: italic;
+  }
+
   .nobreak {
     white-space: nowrap;
   }
diff --git a/view-webapp/src/main/sass/tour.scss b/view-webapp/src/main/sass/tour.scss
index 5a380d4..24e6ce0 100644
--- a/view-webapp/src/main/sass/tour.scss
+++ b/view-webapp/src/main/sass/tour.scss
@@ -42,6 +42,9 @@
     &.centered {
       align-items: center;
     }
+    &.right {
+      align-items: flex-end;
+    }
   }
   .inline.fields {
     background-color: #eeeeee;
diff --git a/view-webapp/src/main/webapp/tour-information.inc.html b/view-webapp/src/main/webapp/tour-information.inc.html
index eca45aa..103487a 100644
--- a/view-webapp/src/main/webapp/tour-information.inc.html
+++ b/view-webapp/src/main/webapp/tour-information.inc.html
@@ -2,19 +2,12 @@
   <form id="tournament-infos" class="ui form #if(!$tour)edit#end">
     <div class="roundbox">
       <div class="two stackable fields">
-        <div class="eleven wide field">
+        <div class="eight wide field">
           <label>Name</label>
           <span class="info"></span>
           <input type="text" name="name" required placeholder="Tournament name" #if($tour) value="$tour.name" #end/>
         </div>
-        <div class="five wide field">
-          <label>Short name</label>
-          <span class="info"></span>
-          <input type="text" name="shortName" required placeholder="yyyymmdd-city" #if($tour) value="$tour.shortName" #end/>
-        </div>
-      </div>
-      <div class="fields">
-        <div class="eight wide field">
+        <div class="right eight wide field">
           <label>Dates</label>
           <span id="date-range">
             from
@@ -25,14 +18,9 @@
             <input type="text" name="endDate" required class="date" placeholder="end date" #if($tour) value="$tour.endDate" #end/>
           </span>
         </div>
-        <div class="eight wide field">
-          <label>Director</label>
-          <span class="info"></span>
-          <input type="text" name="director" placeholder="Tournament director" #if($tour) value="$!tour.director" #end/>
-        </div>
       </div>
       <div class="two stackable fields">
-        <div class="seven wide field">
+        <div class="eight wide field">
           <label>Country</label>
           <span class="info"></span>
           <select name="country" placeholder="country">
@@ -43,7 +31,7 @@
 #end
           </select>
         </div>
-        <div class="nine wide field">
+        <div class="right eight wide field">
           <label>Location</label>
           <div class="edit online">
             <label>
@@ -54,6 +42,18 @@
           <input name="location" type="text" placeholder="tournament location" value="#if($tour)$!tour.location#end"/>
         </div>
       </div>
+      <div class="fields">
+        <div class="eight wide field">
+          <label>Director</label>
+          <span class="info"></span>
+          <input type="text" name="director" placeholder="Tournament director" #if($tour) value="$!tour.director" #end/>
+        </div>
+        <div class="right eight wide field">
+          <label>Short name</label>
+          <span class="info"></span>
+          <input type="text" name="shortName" required placeholder="yyyymmdd-city" #if($tour) value="$tour.shortName" #end/>
+        </div>
+      </div>
     </div>
     <div class="roundbox">
       <div class="two fields">
@@ -73,7 +73,7 @@
             *#
           </select>
         </div>
-        <div class="four wide field">
+        <div class="right four wide field">
           <label>Rounds</label>
           <span class="info"></span>
           <input type="number" name="rounds" required min="1" value="#if($tour)$tour.rounds#{else}1#end"/>
diff --git a/view-webapp/src/main/webapp/tour-registration.inc.html b/view-webapp/src/main/webapp/tour-registration.inc.html
index 3d1fcab..c77a308 100644
--- a/view-webapp/src/main/webapp/tour-registration.inc.html
+++ b/view-webapp/src/main/webapp/tour-registration.inc.html
@@ -186,18 +186,18 @@
           </div>
           <div class="two stackable fields">
             <div class="eight wide field">
-              <label>Rank</label>
+              <label>Rating</label>
+              <span class="info"></span>
+              <input name="rating" type="text" class="numeric"/>
+            </div>
+            <div class="eight wide field">
+              <label>Rank<span class="note">initialized from rating</span></label>
               <span class="info"></span>
               <select name="rank">
                 <option></option>
 #levels()
               </select>
             </div>
-            <div class="eight wide field">
-              <label>Rating</label>
-              <span class="info"></span>
-              <input name="rating" type="text" class="numeric"/>
-            </div>
           </div>
           <div class="inline fields">
             <label>Final ?</label>