diff --git a/logs/migrations/0001_initial.py b/logs/migrations/0001_initial.py
index de938d9..568079c 100644
--- a/logs/migrations/0001_initial.py
+++ b/logs/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.1 on 2018-01-27 13:35
+# Generated by Django 2.0.1 on 2018-01-27 20:08
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -27,6 +27,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=128)),
+                ('slug', models.CharField(max_length=128, unique=True)),
                 ('hidden', models.BooleanField(default=False)),
             ],
         ),
diff --git a/logs/migrations/0002_source_slug.py b/logs/migrations/0002_source_slug.py
deleted file mode 100644
index ad326a3..0000000
--- a/logs/migrations/0002_source_slug.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.0.1 on 2018-01-27 15:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('logs', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='source',
-            name='slug',
-            field=models.CharField(default='', max_length=128),
-            preserve_default=False,
-        ),
-    ]
diff --git a/logs/migrations/0003_auto_20180127_1700.py b/logs/migrations/0003_auto_20180127_1700.py
deleted file mode 100644
index 1d0685b..0000000
--- a/logs/migrations/0003_auto_20180127_1700.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.1 on 2018-01-27 16:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('logs', '0002_source_slug'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='source',
-            name='slug',
-            field=models.CharField(max_length=128, unique=True),
-        ),
-    ]
diff --git a/navbar/migrations/0001_initial.py b/navbar/migrations/0001_initial.py
index 2045127..9cc211c 100644
--- a/navbar/migrations/0001_initial.py
+++ b/navbar/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.1 on 2018-01-20 15:13
+# Generated by Django 2.0.1 on 2018-01-27 20:08
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -18,11 +18,20 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('link', models.CharField(blank=True, max_length=512)),
                 ('new_window', models.BooleanField(default=False)),
-                ('icon', models.FilePathField(match='*.png', path='/home/rodolphe/projects/khaganat-web/navbar/static/icons')),
+                ('icon', models.FilePathField(blank=True, match='.png', null=True, path='/home/rodolphe/projects/khaganat-web/navbar/static/icons')),
+                ('weight', models.PositiveSmallIntegerField()),
+                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='navbar.Element')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ElementDescription',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('language', models.CharField(choices=[('en', 'English'), ('fr', 'French')], max_length=10)),
                 ('short_name', models.CharField(max_length=32)),
-                ('full_name', models.CharField(max_length=64)),
-                ('description', models.CharField(max_length=512)),
-                ('parent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='navbar.Element')),
+                ('full_name', models.CharField(blank=True, max_length=64)),
+                ('description', models.CharField(blank=True, max_length=512)),
+                ('element', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='navbar.Element')),
             ],
         ),
     ]
diff --git a/navbar/migrations/0002_auto_20180120_1637.py b/navbar/migrations/0002_auto_20180120_1637.py
deleted file mode 100644
index a64afa3..0000000
--- a/navbar/migrations/0002_auto_20180120_1637.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 2.0.1 on 2018-01-20 15:37
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('navbar', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='element',
-            name='description',
-            field=models.CharField(blank=True, max_length=512),
-        ),
-        migrations.AlterField(
-            model_name='element',
-            name='full_name',
-            field=models.CharField(blank=True, max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='element',
-            name='icon',
-            field=models.FilePathField(blank=True, match='.png', null=True, path='/home/rodolphe/projects/khaganat-web/navbar/static/icons'),
-        ),
-        migrations.AlterField(
-            model_name='element',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='navbar.Element'),
-        ),
-    ]
diff --git a/navbar/migrations/0003_auto_20180120_1644.py b/navbar/migrations/0003_auto_20180120_1644.py
deleted file mode 100644
index 9b8914c..0000000
--- a/navbar/migrations/0003_auto_20180120_1644.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Generated by Django 2.0.1 on 2018-01-20 15:44
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('navbar', '0002_auto_20180120_1637'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ElementDescription',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('language', models.CharField(choices=[('en', 'English'), ('fr', 'French')], max_length=10)),
-                ('short_name', models.CharField(max_length=32)),
-                ('full_name', models.CharField(blank=True, max_length=64)),
-                ('description', models.CharField(blank=True, max_length=512)),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='element',
-            name='description',
-        ),
-        migrations.RemoveField(
-            model_name='element',
-            name='full_name',
-        ),
-        migrations.RemoveField(
-            model_name='element',
-            name='short_name',
-        ),
-        migrations.AddField(
-            model_name='elementdescription',
-            name='element',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='navbar.Element'),
-        ),
-    ]
diff --git a/navbar/migrations/0004_element_weight.py b/navbar/migrations/0004_element_weight.py
deleted file mode 100644
index cd28154..0000000
--- a/navbar/migrations/0004_element_weight.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.0.1 on 2018-01-20 16:10
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('navbar', '0003_auto_20180120_1644'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='element',
-            name='weight',
-            field=models.PositiveSmallIntegerField(default=0),
-            preserve_default=False,
-        ),
-    ]