diff --git a/app/view/templates/media.php b/app/view/templates/media.php
index 170bef9b..7866ade8 100644
--- a/app/view/templates/media.php
+++ b/app/view/templates/media.php
@@ -130,11 +130,26 @@
         <table id="medialist">
         <tr>
             <th id="checkall">x</th>
-            <th><a href="<?= $mediaopt->getsortbyadress('filename') ?>">filename</a></th>
-            <th><a href="<?= $mediaopt->getsortbyadress('extension') ?>">ext</a></th>
-            <th><a href="<?= $mediaopt->getsortbyadress('type') ?>">type</a></th>
-            <th><a href="<?= $mediaopt->getsortbyadress('size') ?>">size</a></th>
-            <th><a href="<?= $mediaopt->getsortbyadress('date') ?>">date</a></th>
+            <th>
+                <a href="<?= $mediaopt->getsortbyadress('filename') ?>">filename</a>
+                <?= $this->insert('macro_tablesort', ['opt' => $mediaopt, 'th' => 'filename']) ?>
+            </th>
+            <th>
+                <a href="<?= $mediaopt->getsortbyadress('extension') ?>">ext</a>
+                <?= $this->insert('macro_tablesort', ['opt' => $mediaopt, 'th' => 'extension']) ?>
+            </th>
+            <th>
+                <a href="<?= $mediaopt->getsortbyadress('type') ?>">type</a>
+                <?= $this->insert('macro_tablesort', ['opt' => $mediaopt, 'th' => 'type']) ?>
+            </th>
+            <th>
+                <a href="<?= $mediaopt->getsortbyadress('size') ?>">size</a>
+                <?= $this->insert('macro_tablesort', ['opt' => $mediaopt, 'th' => 'size']) ?>
+            </th>
+            <th>
+                <a href="<?= $mediaopt->getsortbyadress('date') ?>">date</a>
+                <?= $this->insert('macro_tablesort', ['opt' => $mediaopt, 'th' => 'date']) ?>
+            </th>
             <th>user</th>
             <th>perms</th>
             <th>code</th>
diff --git a/app/view/templates/profile.php b/app/view/templates/profile.php
index 5759dff8..826f3ddd 100644
--- a/app/view/templates/profile.php
+++ b/app/view/templates/profile.php
@@ -2,7 +2,7 @@
 
 use Wcms\Model;
 
-$this->layout('layout', ['title' => 'profile', 'stylesheets' => [$css . 'back.css']]) ?>
+$this->layout('layout', ['title' => 'profile', 'stylesheets' => [$css . 'back.css', $css . 'profile.css']]) ?>
 
 
 <?php $this->start('page') ?>
@@ -50,6 +50,7 @@
 
                     <p>Change some infos about you.</p>
 
+                    <label for="name">Display name (if none, user ID will be used)</label>
                     <input
                         type="text"
                         name="name"
@@ -58,10 +59,10 @@
                         placeholder="<?= $user->id() ?> "
                         maxlength="<?= Wcms\Item::LENGTH_SHORT_TEXT ?>"
                     >
-                    <label for="name">Display name (if none, user ID will be used)</label>
                     </br>
 
 
+                    <label for="url">associated url (can be a page ID)</label>
                     <input
                         type="text"
                         name="url"
@@ -71,7 +72,6 @@
                         placeholder="URL or page ID"
                         maxlength="<?= Wcms\Item::LENGTH_SHORT_TEXT ?>"
                     >
-                    <label for="url">associated url (can be a page ID)</label>
                     </br>
 
                     <p>When you tick the <em>remember-me</em> checkbox during login, you can choose how much time <strong>W</strong> will remember you.</p>
@@ -84,7 +84,6 @@
                         max="<?= Model::MAX_COOKIE_CONSERVATION ?>"
                     >
                     <label for="cookie">Cookie conservation time <i>(In days)</i></label>
-                    </br>
                     <input type="submit" value="update preferences">
                     
                 </form>
@@ -94,22 +93,18 @@
 
                 <form action="<?= $this->url('profilepassword') ?>" method="post" id="password">
 
+                    <p>Password have to be between <?= Wcms\Model::PASSWORD_MIN_LENGTH ?> and <?= Wcms\Model::PASSWORD_MAX_LENGTH ?> characters long.</p>
+
                     <label for="currentpassword">Actual password</label>
-                    </br>
                     <input type="password" name="currentpassword" id="currentpassword" required>
-                    </br>
 
                     <label for="password1">New password</label>
-                    </br>
                     <input type="password" name="password1" id="password1" minlength="<?= Wcms\Model::PASSWORD_MIN_LENGTH ?>" required>
-                    </br>
                     <label for="password2">Confirm new password</label>
-                    </br>
                     <input type="password" name="password2" id="password2" minlength="<?= Wcms\Model::PASSWORD_MIN_LENGTH ?>" required>
+                    <input type="submit" value="update password">
 
-                    <p>Password have to be between <?= Wcms\Model::PASSWORD_MIN_LENGTH ?> and <?= Wcms\Model::PASSWORD_MAX_LENGTH ?> characters long.</p>
 
-                    <input type="submit" value="update password">
 
                 </form>
 
diff --git a/assets/css/profile.css b/assets/css/profile.css
new file mode 100644
index 00000000..c376a180
--- /dev/null
+++ b/assets/css/profile.css
@@ -0,0 +1,21 @@
+section label, section input {
+    display: block;
+}
+
+section#profile {
+    max-width: 400px;
+}
+
+section label {
+    margin-top: 10px;
+    font-weight: bold;
+}
+
+section input {
+    width: 100%;
+    margin: 3px 0;
+}
+
+section h2 {
+    margin-top: 50px;
+}
\ No newline at end of file
diff --git a/assets/css/theme/blue-whale.css b/assets/css/theme/blue-whale.css
index 1b01cc25..ab85254a 100644
--- a/assets/css/theme/blue-whale.css
+++ b/assets/css/theme/blue-whale.css
@@ -26,6 +26,9 @@ button, input[type="submit"] {
 }
 
 
-.submenu, .block {
+.submenu, .block, nav.bar {
     border-radius: 0 0 10px 10px;
+}
+
+label.toogle {
 }
\ No newline at end of file