diff --git a/app.py b/app.py
index 3ef18fe..4e96738 100644
--- a/app.py
+++ b/app.py
@@ -112,10 +112,15 @@ def admin():
         link = AnimeLink.query.filter_by(id=form.id.data).first()
         if link:
             title = link.title
+            folder = title.folder
             db.session.delete(link)
+            db.session.commit()
             if not len(title.links):
                 db.session.delete(title)
-            db.session.commit()
+                db.session.commit()
+            if not len(folder.titles):
+                db.session.delete(folder)
+                db.session.commit()
             form.message = '%s (%s) has been successfully deleted' % (title.name, link.season)
         else:
             form._errors = {'id': ['Id %s was not found in the database' % form.id.data]}
@@ -123,18 +128,31 @@ def admin():
     return render_template('admin/list.html', search_form=SearchForm(), folders=folders, action_form=form)
 
 
+def clean_model(obj):
+    for attr in dir(obj):
+        if not attr.startswith('_') and getattr(obj, attr) is None:
+            try:
+                setattr(obj, attr, '')
+            except Exception:
+                pass
+    return obj
+
+
 @app.route('/admin/edit', methods=['GET', 'POST'])
 @app.route('/admin/edit/<int:link_id>', methods=['GET', 'POST'])
 @auth.login_required
 def admin_edit(link_id=None):
-    titles = AnimeTitle.query.all()
+    folders = AnimeFolder.query.all()
     form = EditForm(request.form)
-    form.folder.choices = [(query.id, query.name) for query in AnimeFolder.query.all()]
 
     if form.validate_on_submit():
+        folder = AnimeFolder.query.filter_by(name=form.folder.data).first()
+        folder = folder if folder else AnimeFolder()
+        folder.name = form.folder.data
+        db.session.add(folder)
         title = AnimeTitle.query.filter_by(name=form.name.data).first()
         title = title if title else AnimeTitle()
-        title.folder_id = form.folder.data
+        title.folder_id = folder.id
         title.name = form.name.data
         title.keyword = form.keyword.data.lower() if form.keyword.data else title.keyword
         db.session.add(title)
@@ -153,17 +171,11 @@ def admin_edit(link_id=None):
         link = AnimeLink.query.filter_by(id=link_id).first()
         form.folder.data = link.title.folder.id
     else:
-        link = AnimeLink()
-        for attr in dir(link):
-            if not attr.startswith('_') and getattr(link, attr) is None:
-                try:
-                    setattr(link, attr, '')
-                except Exception:
-                    pass
-        form.folder.choices = [(0, '')] + form.folder.choices
+        link = clean_model(AnimeLink())
+        link.title = clean_model(AnimeTitle())
         link.vf = False
 
-    return render_template('admin/edit.html', search_form=SearchForm(), link=link, titles=titles, action_form=form)
+    return render_template('admin/edit.html', search_form=SearchForm(), link=link, folders=folders, action_form=form)
 
 
 if __name__ == '__main__':
diff --git a/models.py b/models.py
index 7881f9e..2e6f72a 100644
--- a/models.py
+++ b/models.py
@@ -1,5 +1,5 @@
 from flask_wtf import FlaskForm
-from wtforms import BooleanField, HiddenField, SelectField, StringField
+from wtforms import BooleanField, HiddenField, StringField
 from wtforms.fields.html5 import SearchField, URLField
 from wtforms.validators import DataRequired
 
@@ -42,7 +42,7 @@ class DeleteForm(FlaskForm):
 
 class EditForm(FlaskForm):
     id = HiddenField('id')
-    folder = SelectField('folder', validators=[DataRequired()], coerce=int)
+    folder = StringField('folder', validators=[DataRequired()])
     name = StringField('name', validators=[DataRequired()])
     link = URLField('link', validators=[DataRequired()])
     season = StringField('season', validators=[DataRequired()])
diff --git a/templates/admin/edit.html b/templates/admin/edit.html
index d113f2e..ae70b0e 100644
--- a/templates/admin/edit.html
+++ b/templates/admin/edit.html
@@ -10,7 +10,13 @@
                 <div class="field column">
                     <div class="control is-expanded">
                         <div class="select is-fullwidth">
-                            {{ action_form.folder }}
+                            {{ action_form.folder(value=link.title.folder.name, list='folders', class='input', placeholder='Folder') }}
+                            <datalist id="folders">
+                                {% for folder in folders %}
+                                    <option {{ 'selected' if folder.id == link.title.folder.id }}
+                                            value="{{ folder.name }}">
+                                {% endfor %}
+                            </datalist>
                         </div>
                     </div>
                 </div>
@@ -20,10 +26,12 @@
                         <div class="select is-fullwidth">
                             {{ action_form.name(value=link.title.name, list='animes', class='input', placeholder='Name') }}
                             <datalist id="animes">
-                                {% for title in titles %}
-                                    <option {{ 'selected' if title.id == link.title.id }}
-                                            data-folder-id="{{ title.folder.id }}" value="{{ title.name }}"
-                                            data-keyword="{{ title.keyword }}">
+                                {% for folder in folders %}
+                                    {% for title in folder.titles %}
+                                        <option {{ 'selected' if title.id == link.title.id }}
+                                                data-folder="{{ title.folder.name }}" value="{{ title.name }}"
+                                                data-keyword="{{ title.keyword }}">
+                                    {% endfor %}
                                 {% endfor %}
                             </datalist>
 
@@ -31,7 +39,7 @@
                                 document.getElementById('name').oninput = function (choice) {
                                     document.getElementById('animes').childNodes.forEach(function (option) {
                                         if (option.value === choice.target.value) {
-                                            document.getElementById('folder').value = option.dataset.folderId;
+                                            document.getElementById('folder').value = option.dataset.folder;
                                             document.getElementById('keyword').value = option.dataset.keyword;
                                         }
                                     });
@@ -72,9 +80,11 @@
                         <div class="select is-fullwidth">
                             {{ action_form.keyword(value=link.title.keyword, list='keywords', class='input', placeholder='Keyword') }}
                             <datalist id="keywords">
-                                {% for title in titles %}
-                                    <option {{ 'selected' if title.keyword == link.title.keyword }}
-                                            value="{{ title.keyword }}">
+                                {% for folder in folders %}
+                                    {% for title in folder.titles %}
+                                        <option {{ 'selected' if title.keyword == link.title.keyword }}
+                                                value="{{ title.keyword }}">
+                                    {% endfor %}
                                 {% endfor %}
                             </datalist>
                         </div>
diff --git a/templates/admin/list.html b/templates/admin/list.html
index 860dfe2..8e3c961 100644
--- a/templates/admin/list.html
+++ b/templates/admin/list.html
@@ -28,49 +28,51 @@
         <tbody>
 
         {% for folder in folders %}
-            <th colspan="5" id="{{ folder.name }}">{{ folder.name }}</th>
+            {% if folder.titles|length > 0 %}
+                <th colspan="5" id="{{ folder.name }}">{{ folder.name }}</th>
 
-            {% for title in folder.titles %}
-                {% for link in title.links %}
-                    <tr>
-                        {% if not loop.index0 %}
-                            <td rowspan="{{ title.links|length }}">
-                                {{ title.name }}
+                {% for title in folder.titles %}
+                    {% for link in title.links %}
+                        <tr>
+                            {% if not loop.index0 %}
+                                <td rowspan="{{ title.links|length }}">
+                                    {{ title.name }}
+                                </td>
+                            {% endif %}
+
+                            <td class="{{ link|colorify }}">
+                                {{ link.vf|flagify }}
+                                {{ link.link|urlize(30, target='_blank') }}
                             </td>
-                        {% endif %}
 
-                        <td class="{{ link|colorify }}">
-                            {{ link.vf|flagify }}
-                            {{ link.link|urlize(30, target='_blank') }}
-                        </td>
+                            <td>
+                                {{ link.season }}
+                            </td>
 
-                        <td>
-                            {{ link.season }}
-                        </td>
+                            <td>
+                                {{ link.comment|urlize(target='_blank') }}
+                            </td>
 
-                        <td>
-                            {{ link.comment|urlize(target='_blank') }}
-                        </td>
-
-                        <td>
-                            <a href="{{ url_for('search', q=link.title.keyword) }}" target="_blank">
-                                <i class="fa fa-search"></i>
-                            </a>
-                            <i>&nbsp;</i>
-                            <a href="{{ url_for('admin_edit', link_id=link.id) }}">
-                                <i class="fa fa-pencil"></i>
-                            </a>
-                            <i>&nbsp;</i>
-                            <form method="post">
-                                {{ action_form.id(value=link.id) }}
-                                <button class="fa fa-trash fa-button"
-                                        onclick="return confirm('Are you sure you want to delete this item ?')">
-                                </button>
-                            </form>
-                        </td>
-                    </tr>
+                            <td>
+                                <a href="{{ url_for('search', q=link.title.keyword) }}" target="_blank">
+                                    <i class="fa fa-search"></i>
+                                </a>
+                                <i>&nbsp;</i>
+                                <a href="{{ url_for('admin_edit', link_id=link.id) }}">
+                                    <i class="fa fa-pencil"></i>
+                                </a>
+                                <i>&nbsp;</i>
+                                <form method="post">
+                                    {{ action_form.id(value=link.id) }}
+                                    <button class="fa fa-trash fa-button"
+                                            onclick="return confirm('Are you sure you want to delete this item ?')">
+                                    </button>
+                                </form>
+                            </td>
+                        </tr>
+                    {% endfor %}
                 {% endfor %}
-            {% endfor %}
+            {% endif %}
         {% endfor %}
 
         </tbody>