diff --git a/palanaeum/apps.py b/palanaeum/apps.py
index cc656e6..17ba535 100644
--- a/palanaeum/apps.py
+++ b/palanaeum/apps.py
@@ -19,10 +19,8 @@ def ready(self):
                 ['git', 'rev-parse', '--verify', 'HEAD', '--short'],
                 cwd=settings.BASE_DIR, universal_newlines=True
             ).strip()
-            print(self.version, "THIS HAPPENS!!!!!")
         except (FileNotFoundError, subprocess.CalledProcessError):
             # No git installed or we're not a git instance at all
             # We generate a random version tag
             signs = set(string.hexdigits.lower())
             self.version = 'r' + "".join(random.sample(signs, 6))
-
diff --git a/palanaeum/forms.py b/palanaeum/forms.py
index e45595a..1555088 100644
--- a/palanaeum/forms.py
+++ b/palanaeum/forms.py
@@ -8,7 +8,7 @@
 from django.forms.widgets import DateInput
 from django.utils.translation import ugettext_lazy as _
 
-from .models import UserSettings, Event, Entry, RelatedSite
+from .models import UserSettings, Event, Entry, RelatedSite, UsersEntryCollection
 
 
 class UserCreationFormWithEmail(UserCreationForm):
@@ -130,6 +130,11 @@ class Meta:
         fields = ('name', 'url', 'image', 'order')
 
 
+class UsersEntryCollectionForm(ModelForm):
+    class Meta:
+        model = UsersEntryCollection
+        fields = ('name', 'description', 'public')
+
 class GeneralConfig(Form):
     page_title = CharField(max_length=100, label=_('Page name'))
     index_hello = CharField(max_length=1000, label=_('Index welcome text'),
diff --git a/palanaeum/migrations/0002_auto_20180502_1627.py b/palanaeum/migrations/0002_auto_20180502_1627.py
new file mode 100644
index 0000000..e5055d6
--- /dev/null
+++ b/palanaeum/migrations/0002_auto_20180502_1627.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.0.4 on 2018-05-02 16:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('palanaeum', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='usersentrycollection',
+            name='starred',
+        ),
+        migrations.AddField(
+            model_name='usersentrycollection',
+            name='description',
+            field=models.TextField(default=''),
+        ),
+        migrations.AddField(
+            model_name='usersentrycollection',
+            name='entries',
+            field=models.ManyToManyField(related_name='collections', to='palanaeum.Entry'),
+        ),
+    ]
diff --git a/palanaeum/models.py b/palanaeum/models.py
index 1e8d615..48b4348 100644
--- a/palanaeum/models.py
+++ b/palanaeum/models.py
@@ -16,7 +16,7 @@
 from django.contrib.postgres.indexes import GinIndex
 from django.core.exceptions import PermissionDenied
 from django.core.files.uploadedfile import UploadedFile
-from django.db import models, IntegrityError, connection
+from django.db import models, connection
 from django.db.models import Max, Count, Q
 from django.urls import reverse
 from django.utils import timezone
@@ -175,8 +175,8 @@ def created_by_html(self):
     def save(self, *args, **kwargs):
         self.modified_date = timezone.now()
         request = get_request()
-        if request and hasattr(request, 'user'):
-            self.modified_by = get_request().user
+        if request and hasattr(request, 'user') and isinstance(request.user, User):
+            self.modified_by = request.user
         super(Content, self).save(*args, **kwargs)
 
 
@@ -346,6 +346,20 @@ def __str__(self):
     def get_absolute_url(self):
         return reverse('view_event', args=(self.id, slugify(self.name)))
 
+    def get_next_url(self):
+        next_event = Event.all_visible.filter(date__lte=self.date)\
+            .exclude(pk=self.pk).values_list("id", "name").first()
+
+        if next_event:
+            return reverse('view_event', args=(next_event[0], slugify(next_event[1])))
+
+    def get_prev_url(self):
+        prev_event = Event.all_visible.filter(date__gte=self.date)\
+            .exclude(pk=self.pk).values_list("id", "name").last()
+
+        if prev_event:
+            return reverse('view_event', args=(prev_event[0], slugify(prev_event[1])))
+
     def sources_iterator(self):
         yield from AudioSource.all_visible.filter(event=self)
         yield from ImageSource.all_visible.filter(event=self)
@@ -373,26 +387,6 @@ def entries_count(self):
         return Entry.all_visible.filter(event=self).count()
 
 
-class UsersEntryCollection(TimeStampedModel):
-    """
-    Users are allowed to create and manage their private collections. They may share them with others, too!
-    """
-    class Meta:
-        verbose_name = _('user_entry_collection')
-        verbose_name_plural = _('user_entry_collections')
-
-    user = models.ForeignKey(User, related_name='collections', on_delete=models.CASCADE)
-    name = models.CharField(max_length=250)
-    public = models.BooleanField(default=False)
-    starred = models.BooleanField(default=False)
-
-    def save(self, **kwargs):
-        if self.starred:
-            if UsersEntryCollection.objects.exclude(pk=self.id).filter(user_id=self.user_id, starred=True).exists():
-                raise IntegrityError("There can be only one starred collection per user.")
-        return super(UsersEntryCollection, self).save(**kwargs)
-
-
 class Entry(TimeStampedModel, Taggable, Content):
     """
     A single Entry represents more or less one question and one answer given by fan and answered by author.
@@ -569,6 +563,28 @@ def update(self):
         self.save()
 
 
+class UsersEntryCollection(TimeStampedModel):
+    """
+    Users are allowed to create and manage their private collections. They may share them with others, too!
+    """
+    MAX_NAME_LENGTH = 250
+
+    class Meta:
+        verbose_name = _('user_entry_collection')
+        verbose_name_plural = _('user_entry_collections')
+        ordering = ('name',)
+
+    user = models.ForeignKey(User, related_name='collections', on_delete=models.CASCADE)
+    name = models.CharField(max_length=MAX_NAME_LENGTH)
+    description = models.TextField(default='', blank=True)
+    public = models.BooleanField(default=False)
+    entries = models.ManyToManyField(Entry, related_name='collections')
+
+    def save(self, **kwargs):
+        self.description = bleach.clean(self.description, strip=True, strip_comments=True)
+        super().save(**kwargs)
+
+
 class EntryVersion(models.Model):
     """
     This is one of the version an Entry can have. Versions are collections of EntryLines and represent history of
diff --git a/palanaeum/sass/palanaeum.scss b/palanaeum/sass/palanaeum.scss
index c8e9fa1..c9beb72 100644
--- a/palanaeum/sass/palanaeum.scss
+++ b/palanaeum/sass/palanaeum.scss
@@ -122,6 +122,20 @@ main {
   color: darkblue;
 }
 
+table {
+  caption, thead th {
+    background-color: $theme-color;
+    color: $text-light;
+  }
+  td {
+    vertical-align: middle !important;
+  }
+  .narrow-col{
+    width: 50px;
+    text-align: center;
+  }
+}
+
 .input-table {
   margin-top: 10px;
   margin-bottom: 10px;
@@ -142,10 +156,6 @@ main {
     border-bottom: 1px dotted #dddddd;
     vertical-align: middle;
   }
-  caption {
-    background-color: $theme-color;
-    color: $text-light;
-  }
   input:not([type="submit"]):not([type="checkbox"]),
   select,
   textarea {
@@ -262,6 +272,7 @@ a.url-icon {
   .entry-content {
     text-align: left;
     padding: 0 10px 0px 10px;
+    clear: left;
     h4 {
       font-weight: bold;
     }
@@ -792,3 +803,65 @@ del {
   padding: 10px;
   text-align: center;
 }
+
+.collections-list {
+  .privacy-icon {
+    font-size: 2em;
+    text-align: center;
+  }
+}
+
+
+.ui-widget-header {
+  background: white !important;
+  color: black !important;
+  border-width: 0 !important;
+}
+
+#collections-dialog {
+  #collections-scroll-list {
+    display: block;
+    min-width: 150px;
+    min-height: 300px;
+    max-height: 300px;
+    overflow-y: auto;
+    padding: 2px;
+    width: 100%;
+    height: 100%;
+    input {
+      margin: 5px;
+    }
+    .collection-elem{
+      padding: 3px;
+      border-bottom: 1px solid whitesmoke;
+      .collection-elem-symbol {
+        float: right;
+        line-height: 38px;
+      }
+    }
+  }
+  button {
+    width: 100%;
+  }
+  #add-collection-input {
+    width: 100%;
+    input {
+      width: 83%;
+      border: 1px solid #a0a0a0;
+      height: 38px;
+    }
+    button {
+      width: 15%;
+    }
+  }
+  display: none;
+  border-top: 1px solid whitesmoke;
+}
+
+.ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button{
+	font family: 'Roboto', sans-serif;
+} 
+
+.no-overflow {
+	word-break: break-word;
+}
diff --git a/palanaeum/settings/base.py b/palanaeum/settings/base.py
index dea09ec..d860635 100644
--- a/palanaeum/settings/base.py
+++ b/palanaeum/settings/base.py
@@ -23,7 +23,7 @@
 
 RUNSERVERPLUS_SERVER_ADDRESS_PORT = '0.0.0.0:9000'
 
-PALANAEUM_VERSION = '1.0.0'
+PALANAEUM_VERSION = '1.1.0'
 
 
 # Application definition
diff --git a/palanaeum/staff_views.py b/palanaeum/staff_views.py
index ac79c5d..7c100d3 100644
--- a/palanaeum/staff_views.py
+++ b/palanaeum/staff_views.py
@@ -56,7 +56,7 @@ def edit_event(request, event_id=None):
     else:
         form = EventForm(instance=event)
 
-    return render(request, 'palanaeum/event_edit_form.html',
+    return render(request, 'palanaeum/staff/event_edit_form.html',
                   {'form': form, 'new_event': event is None, 'event_id': event_id, 'event': event})
 
 
@@ -74,7 +74,7 @@ def remove_event(request, event_id):
                                                   event.id)
         return redirect(reverse('index'))
 
-    return render(request, 'palanaeum/delete_event_confirm.html', {'event': event})
+    return render(request, 'palanaeum/staff/delete_event_confirm.html', {'event': event})
 
 
 @staff_member_required(login_url='auth_login')
@@ -91,7 +91,7 @@ def remove_entry(request, entry_id):
                                                   entry.id)
         return redirect('view_event_no_title', entry.event_id)
 
-    return render(request, 'palanaeum/delete_entry_confirm.html', {'entry': entry})
+    return render(request, 'palanaeum/staff/delete_entry_confirm.html', {'entry': entry})
 
 
 @staff_member_required(login_url='auth_login')
@@ -109,7 +109,7 @@ def remove_audio_file(request, file_id):
                                                   audio_file.id)
         return redirect('view_event_no_title', event_id=audio_file.event_id)
 
-    return render(request, 'palanaeum/delete_audio_file_confirm.html',
+    return render(request, 'palanaeum/staff/delete_audio_file_confirm.html',
                   {'file_id': file_id, 'file': audio_file,
                    'back': reverse('view_event_no_title', kwargs={'event_id': audio_file.event_id})})
 
@@ -129,7 +129,7 @@ def remove_image_source(request, source_id):
                                                   img_source.id)
         return redirect('view_event_no_title', event_id=img_source.event_id)
 
-    return render(request, 'palanaeum/delete_image_source_confirm.html',
+    return render(request, 'palanaeum/staff/delete_image_source_confirm.html',
                   {'source': img_source})
 
 
@@ -248,7 +248,7 @@ def edit_audio_source(request, source_id):
     for snippet in snippets:
         snippet.foreign = not ((snippet.created_by == request.user) or request.user.is_staff)
 
-    return render(request, 'palanaeum/audio_source_edit.html', {'source': source, 'snippets': snippets})
+    return render(request, 'palanaeum/staff/audio_source_edit.html', {'source': source, 'snippets': snippets})
 
 
 @staff_member_required(login_url='auth_login')
@@ -398,7 +398,7 @@ def edit_snippet_entry(request, snippet_id):
     if not all_event_entries.exists():
         return redirect('create_entry_for_snippet', snippet_id=snippet.id)  # Create a new entry for the snippet
 
-    return render(request, 'palanaeum/edit_snippet_entry.html',
+    return render(request, 'palanaeum/staff/edit_snippet_entry.html',
                   {'snippet': snippet, 'event_entries': all_event_entries})
 
 
@@ -453,7 +453,7 @@ def edit_entry(request, entry_id=None, event_id=None):
         snippets = []
         images = []
 
-    return render(request, 'palanaeum/entry_edit_form.html', {'entry': entry, 'event': entry.event, 'snippets': snippets,
+    return render(request, 'palanaeum/staff/entry_edit_form.html', {'entry': entry, 'event': entry.event, 'snippets': snippets,
                                                               'images': images})
 
 
@@ -507,7 +507,7 @@ def make_html(version):
 
     html_diff = htmldiff(older_html, newer_html)
 
-    return render(request, "palanaeum/entry_history.html", {
+    return render(request, "palanaeum/staff/entry_history.html", {
         'newer_version': newer,
         'newer_html': newer_html,
         'html_diff': html_diff,
@@ -758,7 +758,7 @@ def choose_source_type(request, event_id):
     Display a page where users select what type of sources they want to upload.
     """
     event = get_object_or_404(Event, pk=event_id)
-    return render(request, 'palanaeum/choose_source_type.html', {'event': event})
+    return render(request, 'palanaeum/staff/choose_source_type.html', {'event': event})
 
 
 @login_required(login_url='auth_login')
@@ -772,7 +772,7 @@ def upload_audio_page(request, event_id):
     else:
         limit = get_config('audio_user_size_limit')
     readable_limit = "{:4.2f} MB".format(limit)
-    return render(request, 'palanaeum/upload_audio_page.html',
+    return render(request, 'palanaeum/staff/upload_audio_page.html',
                   {'event': event, 'file_size_limit': limit * 1024 * 1024,
                    'readable_limit': readable_limit})
 
@@ -785,7 +785,7 @@ def upload_images_page(request, event_id):
     event = get_object_or_404(Event, pk=event_id)
     limit = get_config('image_size_limit')
     readable_limit = "{:4.2f} MB".format(limit)
-    return render(request, 'palanaeum/upload_images_page.html',
+    return render(request, 'palanaeum/staff/upload_images_page.html',
                   {'event': event, 'file_size_limit': limit * 1024 * 1024,
                    'readable_limit': readable_limit})
 
@@ -836,7 +836,7 @@ def edit_image_source_entry(request, source_id):
     if not all_event_entries.exists():
         return redirect('create_entry_for_image_source', source_id=source_id)  # Create a new entry for the image
 
-    return render(request, 'palanaeum/edit_image_entry.html',
+    return render(request, 'palanaeum/staff/edit_image_entry.html',
                   {'image': img, 'event_entries': all_event_entries})
 
 
@@ -869,7 +869,7 @@ def sort_entries_page(request, event_id):
     entries_ids = Entry.objects.filter(event=event).values_list('id', flat=True)
     entries = Entry.prefetch_entries(entries_ids, show_unapproved=True)
     entries = sorted(entries.values(), key=lambda e: e.order)
-    return render(request, 'palanaeum/sort_entries.html',
+    return render(request, 'palanaeum/staff/sort_entries.html',
                   {'event': event, 'entries': entries, 'sources': list(event.sources_iterator())})
 
 
@@ -992,7 +992,7 @@ def mute_snippet(request, source_id):
             logging.getLogger('palanaeum.staff').info("%s scheduled muting of snippet %s", request.user, snippet)
             return redirect('mute_snippet', source_id=source_id)
 
-    return render(request, 'palanaeum/mute_snippet.html', {'snippets': snippets, 'audio_source': audio_source})
+    return render(request, 'palanaeum/staff/mute_snippet.html', {'snippets': snippets, 'audio_source': audio_source})
 
 
 @staff_member_required(login_url='auth_login')
@@ -1010,7 +1010,7 @@ def staff_cp_suggestions(request):
     for source in source_suggestions:
         all_suggestions[source.event]['sources'].append(source)
 
-    return render(request, 'palanaeum/staff_cp_suggestions.html',
+    return render(request, 'palanaeum/staff/staff_cp_suggestions.html',
                   {'sources': source_suggestions, 'entries': entry_suggestions,
                    'all_suggestions': dict(all_suggestions),
                    'page': 'suggestions'})
@@ -1022,4 +1022,4 @@ def staff_cp(request):
     Display a page with summary of all unapproved suggestions etc.
     """
 
-    return render(request, 'palanaeum/staff_cp.html', {'page': 'index'})
+    return render(request, 'palanaeum/staff/staff_cp.html', {'page': 'index'})
diff --git a/palanaeum/static/palanaeum/css/palanaeum.css b/palanaeum/static/palanaeum/css/palanaeum.css
index 939ff68..ebc7a80 100644
--- a/palanaeum/static/palanaeum/css/palanaeum.css
+++ b/palanaeum/static/palanaeum/css/palanaeum.css
@@ -505,6 +505,15 @@ main article h3 {
   border-color: darkblue;
   color: darkblue; }
 
+table caption, table thead th {
+  background-color: #004c6e;
+  color: #fff; }
+table td {
+  vertical-align: middle !important; }
+table .narrow-col {
+  width: 50px;
+  text-align: center; }
+
 .input-table {
   margin-top: 10px;
   margin-bottom: 10px; }
@@ -520,9 +529,6 @@ main article h3 {
   .input-table tr:not(:last-of-type) td, .input-table tr:not(:last-of-type) th {
     border-bottom: 1px dotted #dddddd;
     vertical-align: middle; }
-  .input-table caption {
-    background-color: #004c6e;
-    color: #fff; }
   .input-table input:not([type="submit"]):not([type="checkbox"]),
   .input-table select,
   .input-table textarea {
@@ -624,7 +630,8 @@ a.url-icon {
     width: 100%; }
   .entry-article .entry-content {
     text-align: left;
-    padding: 0 10px 0px 10px; }
+    padding: 0 10px 0px 10px;
+    clear: left; }
     .entry-article .entry-content h4 {
       font-weight: bold; }
     .entry-article .entry-content .review-state-marker {
@@ -1007,4 +1014,44 @@ del {
   .admin-button a:hover {
     color: #004c6e; }
 
+.collections-list .privacy-icon {
+  font-size: 2em;
+  text-align: center; }
+
+.ui-widget-header {
+  background: white !important;
+  color: black !important;
+  border-width: 0 !important; }
+
+#collections-dialog {
+  display: none;
+  border-top: 1px solid whitesmoke; }
+  #collections-dialog #collections-scroll-list {
+    display: block;
+    min-width: 150px;
+    min-height: 300px;
+    max-height: 300px;
+    overflow-y: auto;
+    padding: 2px;
+    width: 100%;
+    height: 100%; }
+    #collections-dialog #collections-scroll-list input {
+      margin: 5px; }
+    #collections-dialog #collections-scroll-list .collection-elem {
+      padding: 3px;
+      border-bottom: 1px solid whitesmoke; }
+      #collections-dialog #collections-scroll-list .collection-elem .collection-elem-symbol {
+        float: right;
+        line-height: 38px; }
+  #collections-dialog button {
+    width: 100%; }
+  #collections-dialog #add-collection-input {
+    width: 100%; }
+    #collections-dialog #add-collection-input input {
+      width: 83%;
+      border: 1px solid #a0a0a0;
+      height: 38px; }
+    #collections-dialog #add-collection-input button {
+      width: 15%; }
+
 /*# sourceMappingURL=palanaeum.css.map */
diff --git a/palanaeum/static/palanaeum/css/palanaeum.css.map b/palanaeum/static/palanaeum/css/palanaeum.css.map
index 3243c52..115ae85 100644
--- a/palanaeum/static/palanaeum/css/palanaeum.css.map
+++ b/palanaeum/static/palanaeum/css/palanaeum.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../../sass/_variables.scss","../../../sass/theme.scss","../../../sass/_playerStyle.scss","../../../sass/_commonUtils.scss","../../../sass/_cascadingEditorStyle.scss","../../../sass/palanaeum.scss"],
 "names": [],
 "file": "palanaeum.css"
diff --git a/palanaeum/static/palanaeum/js/copy.js b/palanaeum/static/palanaeum/js/copy.js
index 74e48ea..de14660 100644
--- a/palanaeum/static/palanaeum/js/copy.js
+++ b/palanaeum/static/palanaeum/js/copy.js
@@ -1,5 +1,8 @@
 function get_plain_text(entry) {
     let lines = [];
+    if (entry.hasClass('entry-suggestion')) {
+        lines.push('[suggestion]');
+    }
     for (let elem of entry.find('.entry-content').find('h4, p')) {
         if (elem.tagName === 'H4') {
             lines.push("");
@@ -22,6 +25,10 @@ function get_rich_text(entry) {
     let footnote = entry.find('.footnote').html();
     let entry_url = entry.find(".share-btn")[0].href;
     let source = gettext('source');
+    let suggestion = "";
+    if (entry.hasClass('entry-suggestion')) {
+        suggestion = "<header><em style='font-weight: bold;'>[suggestion]</em></header>";
+    }
 
     if (!footnote)
         footnote = "";
@@ -29,6 +36,7 @@ function get_rich_text(entry) {
         footnote += "<br/>";
 
     return `<article>
+                ${suggestion}
                 <section>${main_content}</section>
                 <footer>
                     <small>
@@ -56,4 +64,4 @@ function copy_entry_text(event) {
 
 $(function(){
     $('.copy-btn').click(copy_entry_text)
-});
\ No newline at end of file
+});
diff --git a/palanaeum/static/palanaeum/js/entry_collections.js b/palanaeum/static/palanaeum/js/entry_collections.js
new file mode 100644
index 0000000..82ef423
--- /dev/null
+++ b/palanaeum/static/palanaeum/js/entry_collections.js
@@ -0,0 +1,118 @@
+function add_rem_entry_to_collection() {
+    const self = $(this);
+    const entry_id = self.data('entry-id');
+    const collection_id = self.data('collection-id');
+    const add = self.is(':checked');
+
+    $.post(Palanaeum.COLLECTION_ADD_REM_URL,
+        {'entry_id': entry_id, 'collection_id': collection_id, 'action': add ? 'add' : 'remove'},
+        function(ret) {
+            self.next('span').text(`${ret['name']} (${ret['size']})`);
+        }
+    );
+}
+
+function add_new_collection_confirm() {
+    const add_button = $('#add-collection-button');
+    const input_section = $('#add-collection-input');
+    const collections_dialog = $('#collections-dialog');
+    const entry_id = collections_dialog.data('entry-id');
+
+    const collection_name = input_section.find('input').val();
+
+    $.post(Palanaeum.COLLECTION_CREATE_URL, {'name': collection_name, 'entry_id': entry_id},
+        function() {
+            collections_dialog.dialog("close");
+            input_section.hide();
+            input_section.find('input').val('');
+            add_button.show();
+            $(`#e${entry_id}`).find('.collection-button').click();
+        });
+}
+
+function add_new_collection() {
+    // let collection_name = prompt('How do you want to name your new collection?' +
+    //     '\n\r(It will be created as private)');
+    const add_button = $('#add-collection-button');
+    const input_section = $('#add-collection-input');
+    add_button.fadeOut(200, function(){
+        input_section.fadeIn(200);
+    });
+
+
+    if (!collection_name) return;
+    const collections_dialog = $('#collections-dialog');
+    const entry_id = collections_dialog.data('entry-id');
+
+    $.post(Palanaeum.COLLECTION_CREATE_URL, {'name': collection_name, 'entry_id': entry_id},
+        function() {
+            collections_dialog.dialog("close");
+            $(`#e${entry_id}`).find('.collection-button').click();
+        });
+}
+
+function update_collection_dialog_and_display(collections_list, parent_button) {
+    const list = collections_list['list'];
+    const collections_dialog = $('#collections-dialog');
+    const coll_list = $('#collections-scroll-list');
+    const template = $('#collection-template');
+    const entry_id = collections_dialog.data('entry-id');
+    coll_list.find('.collection-elem').remove();
+
+    for (const coll of list) {
+        const name = coll['name'];
+        const id = coll['id'];
+        const checked = coll['has_entry'];
+        const size = coll['size'];
+        const pub = coll['public'];
+        let copy = template.clone();
+        copy.find('label span').text(`${name} (${size})`);
+        copy.find('span.collection-elem-symbol').addClass(pub ? 'fa-globe' : 'fa-lock');
+        let input = copy.find('input');
+        input.prop('value', id);
+        input.prop('checked', checked);
+        input.data('entry-id', entry_id);
+        input.data('collection-id', id);
+        input.change(add_rem_entry_to_collection);
+
+        copy.show();
+        coll_list.append(copy);
+    }
+
+    // Displays a list of collections with checkboxes
+    collections_dialog.dialog({
+        position: { my: "right top", at: "right bottom", of: parent_button},
+        resizable: false,
+        modal: true,
+        width: 350,
+        open: function(event, ui) {
+            $('.ui-widget-overlay').bind('click', function() {
+                collections_dialog.dialog('close');
+            });
+        }
+    });
+}
+
+function collection_button_click(event) {
+    const self = $(this);
+    const collections_dialog = $('#collections-dialog');
+    collections_dialog.data('entry-id', $(this).data('entry-id'));
+    // Get the list of collection
+    $.get(Palanaeum.COLLECTION_LIST_URL, {'entry_id': $(this).data('entry-id')},
+        function(ret) {update_collection_dialog_and_display(ret, self)}
+    );
+
+    event.preventDefault();
+    return false;
+}
+
+$(function(){
+    $('a.collection-button').click(collection_button_click);
+    $('#add-collection-button').click(add_new_collection);
+    $('#add-collection-input input').keypress(function(event) {
+        if (event.keyCode === 13) {
+            add_new_collection_confirm();
+        }
+    });
+    $('#add-collection-input button').click(add_new_collection_confirm);
+});
\ No newline at end of file
diff --git a/palanaeum/static/palanaeum/js/modernize_forms.js b/palanaeum/static/palanaeum/js/modernize_forms.js
index 46893be..2701fe5 100644
--- a/palanaeum/static/palanaeum/js/modernize_forms.js
+++ b/palanaeum/static/palanaeum/js/modernize_forms.js
@@ -181,4 +181,13 @@ $(function(){
     $('select.select2').select2({
         'minimumResultsForSearch': 10,
     });
+    tinymce.init({
+        statusbar: false,
+        menubar: false,
+        plugins: "link nonbreaking paste searchreplace autoresize",
+        toolbar: "undo redo | bold italic underline strikethrough | superscript subscript | removeformat | link nonbreaking searchreplace",
+        autoresize_bottom_margin: 5,
+        browser_spellcheck: true,
+        selector: ".tinymce-enabled textarea"
+    });
 });
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/admin/related_sites.html b/palanaeum/templates/palanaeum/admin/related_sites.html
index a864e9c..459a86e 100644
--- a/palanaeum/templates/palanaeum/admin/related_sites.html
+++ b/palanaeum/templates/palanaeum/admin/related_sites.html
@@ -17,8 +17,8 @@ <h1>{% trans 'Related sites' %}</h1>
                 <th>{% trans 'URL' %}</th>
                 <th>{% trans 'Order' %}</th>
                 <th colspan="2" style="text-align: right;">
-                    <a href="{% url 'admin_related_site_new' %}" class="w3-btn w3-green w3-tiny">
-                        <span class="fa fa-plus"></span>
+                    <a href="{% url 'admin_related_site_new' %}" class="w3-btn w3-green">
+                        <span class="fa fa-plus"></span><span class="w3-hide-small"> Add</span>
                     </a>
                 </th>
             </tr>
@@ -30,8 +30,8 @@ <h1>{% trans 'Related sites' %}</h1>
                     <td>{{ site.name }}</td>
                     <td>{{ site.url }}</td>
                     <td>{{ site.order }}</td>
-                    <td><a href="{% url 'admin_related_site_edit' site.pk %}"><span class="fa fa-pencil"></span></a></td>
-                    <td><a href="{% url 'admin_related_site_delete' site.pk %}" class="delete"><span class="fa fa-trash-o"></span></a></td>
+                    <td class="narrow-col"><a href="{% url 'admin_related_site_edit' site.pk %}"><span class="fa fa-pencil"></span></a></td>
+                    <td class="narrow-col"><a href="{% url 'admin_related_site_delete' site.pk %}" class="delete"><span class="fa fa-trash-o"></span></a></td>
                 </tr>
             {% endfor %}
         </tbody>
diff --git a/palanaeum/templates/palanaeum/auth/settings.html b/palanaeum/templates/palanaeum/auth/settings.html
index ec3063a..d1576a0 100644
--- a/palanaeum/templates/palanaeum/auth/settings.html
+++ b/palanaeum/templates/palanaeum/auth/settings.html
@@ -5,6 +5,10 @@
     {% trans 'Settings' %}
 {% endblock %}
 
+{% block page-title %}
+    {% trans 'Settings' %} - {{ block.super }}
+{% endblock %}
+
 {% block one-column-content %}
     {% include 'palanaeum/elements/messages.html' %}
     <form action="{% url 'auth_settings' %}" method="post">
diff --git a/palanaeum/templates/palanaeum/base_layout.html b/palanaeum/templates/palanaeum/base_layout.html
index ff119c5..51b1050 100644
--- a/palanaeum/templates/palanaeum/base_layout.html
+++ b/palanaeum/templates/palanaeum/base_layout.html
@@ -55,6 +55,7 @@
     <script src="{% static 'palanaeum/js/unsaved_changes.js' %}?v={{ VERSION_TAG }}" type="text/javascript"></script>
     <script src="{% static 'palanaeum/js/ajax_csrf.js' %}?v={{ VERSION_TAG }}" type="text/javascript"></script>
     <script src="{% static 'palanaeum/js/copy.js' %}?v={{ VERSION_TAG }}" type="text/javascript"></script>
+    <script src="{% static 'palanaeum/js/entry_collections.js' %}?v={{ VERSION_TAG }}" type="text/javascript"></script>
 
     <script type="text/javascript">
         // Noty setup
@@ -96,7 +97,10 @@
             <a class="w3-bar-item w3-hover-theme w3-button w3-ripple w3-block w3-left-align" href="{% url 'events_list' %}"><span class="fa fa-calendar"></span> {% trans 'Events' %}</a>
             <a class="w3-bar-item w3-hover-theme w3-button w3-ripple w3-block w3-left-align" href="{% url 'recent_entries' %}"><span class="fa fa-clock-o"></span> {% trans 'Recent' %}</a>
             <a class="w3-bar-item w3-hover-theme w3-button w3-ripple w3-block w3-left-align" href="{% url 'tags_list' %}"><span class="fa fa-tags"></span> {% trans 'Tags' %}</a>
-            <!--<a class="w3-bar-item w3-hover-theme w3-button w3-ripple w3-block w3-left-align" href=""><span class="fa fa-question-circle-o"></span> {% trans 'FAQ' %}</a>-->
+
+            {% if user.is_authenticated %}
+                <a class="w3-bar-item w3-hover-theme w3-button w3-ripple w3-block w3-left-align" href="{% url 'collections_list' %}"><span class="fa fa-list"></span> {% trans 'Collections' %}</a>
+            {% endif %}
 
             {% if user.is_superuser %}
                 <a class="w3-bar-item w3-hover-theme w3-button w3-ripple w3-block w3-left-align" href="{% url 'admin_index' %}"><span class="fa fa-server"></span> Admin CP</a>
@@ -147,7 +151,7 @@
         <div class="afterlogo">
                 <div class="login w3-theme-dark {% if user.is_authenticated %} hidden {% endif %}">
                     <nav class="w3-bar">
-                        <a class="w3-hover-theme w3-bar-item" href="{% url 'auth_login' %}"><span class="fa fa-sign-in"></span> {% trans 'Sign in' %}</a>
+                        <a class="w3-hover-theme w3-bar-item" href="{% url 'auth_login' %}?next={{ request.path }}"><span class="fa fa-sign-in"></span> {% trans 'Sign in' %}</a>
                         <a class="w3-hover-theme w3-bar-item" href="{% url 'auth_register' %}"><span class="fa fa-user-plus"></span> {% trans 'Sign up' %}</a>
                     </nav>
                 </div>
@@ -175,20 +179,19 @@
                     <a class="w3-hover-theme w3-bar-item " href="{% url 'tags_list' %}"> {% trans 'Tags' %}</a>
                     <a class="w3-hover-theme w3-bar-item" href="https://coppermind.net/" target="_blank"> {% trans 'Wiki' %}</a>
                     <a class="w3-hover-theme w3-bar-item" href="https://discord.gg/DUMHAVV" target="_blank"> {% trans 'Chat' %}</a>
-                    <!--<a class="w3-hover-theme w3-bar-item " href="">{% trans 'Help' %}</a>-->
                     {% if user.is_authenticated %}
                         <div class="w3-dropdown-click w3-hover-theme " style="margin-left: 12px;">
                             <button onclick="dropdown()" class="w3-button w3-hover-theme"><span class="fa fa-user">{% include 'palanaeum/elements/notification_badge.html' %}</span></button>
                             <div id="userMenu" class="w3-dropdown-content w3-bar-block w3-border">
-                                <!--<a class="w3-hover-theme w3-bar-item" href=""><span class="fa fa-star"></span> {% trans 'Favorites' %}</a>-->
-                                <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_settings' %}"><span class="fa fa-cog"></span> Settings</a>
+                                <a class="w3-hover-theme w3-bar-item " href="{% url 'collections_list' %}"><span class="fa fa-list"></span> {% trans 'Collections' %}</a>
+                                <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_settings' %}"><span class="fa fa-cog"></span> {% trans 'Settings' %}</a>
                                 {% if user.is_superuser %}
-                                    <a class="w3-hover-theme w3-bar-item " href="{% url 'admin_index' %}"><span class="fa fa-server"></span> Admin CP</a>
+                                    <a class="w3-hover-theme w3-bar-item " href="{% url 'admin_index' %}"><span class="fa fa-server"></span> {% trans 'Admin CP' %}</a>
                                 {% endif %}
                                 {% if user.is_staff %}
-                                    <a class="w3-hover-theme w3-bar-item " href="{% if SUGGESTIONS_COUNT %}{% url 'staff_suggestions' %}{% else %}{% url 'staff_index' %}{% endif %}"><span class="fa fa-university"></span> Staff CP {% if SUGGESTIONS_COUNT %}<span class="w3-badge w3-red">{{ SUGGESTIONS_COUNT }}</span>{% endif %}</a>
+                                    <a class="w3-hover-theme w3-bar-item " href="{% if SUGGESTIONS_COUNT %}{% url 'staff_suggestions' %}{% else %}{% url 'staff_index' %}{% endif %}"><span class="fa fa-university"></span> {% trans 'Staff CP' %} {% if SUGGESTIONS_COUNT %}<span class="w3-badge w3-red">{{ SUGGESTIONS_COUNT }}</span>{% endif %}</a>
                                 {% endif %}
-                                <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_logout' %}"><span class="fa fa-power-off"></span> Sign Out</a>
+                                <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_logout' %}"><span class="fa fa-power-off"></span> {% trans 'Sign out' %}</a>
                             </div>
                         </div>
                     {% endif %}
@@ -227,21 +230,21 @@
                 <div class="w3-dropdown-click w3-hover-theme w3-right">
                     <button onclick="dropdown2()" class="w3-button w3-hover-theme"><span class="fa fa-user">{% include 'palanaeum/elements/notification_badge.html' %}</span></button>
                     <div id="menuSmall" class="w3-dropdown-content w3-bar-block w3-border">
-                        <!--<a class="w3-hover-theme w3-bar-item" href=""><span class="fa fa-star"></span> {% trans 'Favorites' %}</a>-->
-                        <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_settings' %}"><span class="fa fa-cog"></span> Settings</a>
+                        <a class="w3-hover-theme w3-bar-item " href="{% url 'collections_list' %}"><span class="fa fa-list"></span> {% trans 'Collections' %}</a>
+                        <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_settings' %}"><span class="fa fa-cog"></span> {% trans 'Settings' %}</a>
                         {% if user.is_superuser %}
-                            <a class="w3-hover-theme w3-bar-item " href="{% url 'admin_index' %}"><span class="fa fa-server"></span> Admin CP</a>
+                            <a class="w3-hover-theme w3-bar-item " href="{% url 'admin_index' %}"><span class="fa fa-server"></span> {% trans 'Admin CP' %}</a>
                         {% endif %}
                         {% if user.is_staff %}
-                            <a class="w3-hover-theme w3-bar-item " href="{% if SUGGESTIONS_COUNT %}{% url 'staff_suggestions' %}{% else %}{% url 'staff_index' %}{% endif %}"><span class="fa fa-university"></span> Staff CP {% if SUGGESTIONS_COUNT %}<span class="w3-badge w3-red">{{ SUGGESTIONS_COUNT }}</span>{% endif %}</a>
+                            <a class="w3-hover-theme w3-bar-item " href="{% if SUGGESTIONS_COUNT %}{% url 'staff_suggestions' %}{% else %}{% url 'staff_index' %}{% endif %}"><span class="fa fa-university"></span> {% trans 'Staff CP' %} {% if SUGGESTIONS_COUNT %}<span class="w3-badge w3-red">{{ SUGGESTIONS_COUNT }}</span>{% endif %}</a>
                         {% endif %}
-                        <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_logout' %}"><span class="fa fa-power-off"></span> Sign Out</a>
+                        <a class="w3-hover-theme w3-bar-item " href="{% url 'auth_logout' %}"><span class="fa fa-power-off"></span> {% trans 'Sign Out' %}</a>
                     </div>
                 </div>
                 <!--<a class="w3-hover-theme w3-bar-item w3-right" href="{% url 'auth_logout' %}"><span class="fa fa-power-off"></span></a>
                 <a class="w3-hover-theme w3-bar-item w3-right" href="{% url 'auth_settings' %}"><span class="fa fa-cog"></span> Settings</a>-->
             {% else %}
-                <a class="w3-hover-theme w3-bar-item w3-right" href="{% url 'auth_login' %}" title="Sign In"><span class="fa fa-sign-in"></span></a>
+                <a class="w3-hover-theme w3-bar-item w3-right" href="{% url 'auth_login' %}?next={{ request.path }}" title="Sign In"><span class="fa fa-sign-in"></span></a>
                 <a class="w3-hover-theme w3-bar-item w3-right" href="{% url 'auth_register' %}" title="Sign Up"><span class="fa fa-user-plus"></span></a>
             {% endif %}
         </nav>
@@ -251,6 +254,7 @@
     <main class="w3-row w3-margin-top w3-panel">
         {% block main-content %}
         {% endblock %}
+        {% include 'palanaeum/collections/collections_dialog.html' %}
     </main>
     </div>
     <footer class="w3-container w3-center w3-text-grey">
diff --git a/palanaeum/templates/palanaeum/collections/collection.html b/palanaeum/templates/palanaeum/collections/collection.html
new file mode 100644
index 0000000..bfa8caa
--- /dev/null
+++ b/palanaeum/templates/palanaeum/collections/collection.html
@@ -0,0 +1,28 @@
+{% extends 'palanaeum/one_column_layout.html' %}
+{% load i18n %}
+
+{% block page-header %}
+    {{ collection.name }}
+{% endblock %}
+
+{% if is_owner %}
+    {% block pre-page-header %}
+        <a class="w3-btn button2 w3-right" href="{% url 'collection_edit' collection.id %}"><span class="fa fa-edit"></span> {% trans 'Edit' %}</a>
+    {% endblock %}
+{% endif %}
+
+{% block page-title %}
+    {{ collection.name }} - {{ block.super }}
+{% endblock %}
+
+{% block one-column-content %}
+    {% include 'palanaeum/elements/messages.html' %}
+    <section class="w3-panel">
+        {{ collection.description|safe }}
+    </section>
+    {% for entry in entries %}
+        <section class="collected-entry">
+            {% include 'palanaeum/elements/entry_li.html' with number=forloop.counter show_event=1 %}
+        </section>
+    {% endfor %}
+{% endblock %}
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/collections/collection_edit.html b/palanaeum/templates/palanaeum/collections/collection_edit.html
new file mode 100644
index 0000000..14fa997
--- /dev/null
+++ b/palanaeum/templates/palanaeum/collections/collection_edit.html
@@ -0,0 +1,43 @@
+{% extends 'palanaeum/one_column_layout.html' %}
+{% load i18n %}
+
+{% block page-title %}
+    {% if new_collection %}
+        {% trans 'New collection' %}
+    {% else %}
+        {% trans 'Edit collection' %}
+    {% endif %}
+{% endblock %}
+
+{% block page-header %}
+    {% if new_collection %}
+        {% trans 'New collection' %}
+    {% else %}
+        {% trans 'Edit collection' %}
+    {% endif %}
+{% endblock %}
+
+{% block one-column-content %}
+    <a class="navlink" href="{% url 'collections_list' %}"><span class="fa fa-arrow-left"></span> {% trans 'Back to collections' %}</a>
+    <form action="{% if collection.id %}{% url 'collection_edit' collection.id %}{% else %}{% url 'collection_create' %}{% endif %}" method="post">
+        {% csrf_token %}
+        <table class="input-table narrow-table tinymce-enabled">
+            <caption>
+            {% if new_event %}
+                {% trans 'Collection creation form' %}
+            {% else %}
+                {% trans 'Collection edition form' %}
+            {% endif %}
+            </caption>
+            <tbody>
+                {{ form.as_table }}
+                <tr>
+                    <td></td>
+                    <td style="text-align: right">
+                        <input type="submit" class="w3-btn button1" value="{% trans 'Save' %}">
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/collections/collection_list.html b/palanaeum/templates/palanaeum/collections/collection_list.html
new file mode 100644
index 0000000..25c68ee
--- /dev/null
+++ b/palanaeum/templates/palanaeum/collections/collection_list.html
@@ -0,0 +1,60 @@
+{% extends 'palanaeum/one_column_layout.html' %}
+{% load i18n %}
+
+{% block page-header %}
+    {% trans 'Your collections' %}
+{% endblock %}
+
+{% block page-title %}
+    {% trans 'Your collections' %} - {{ block.super }}
+{% endblock %}
+
+{% block one-column-content %}
+    <section class="w3-container">
+        {% include 'palanaeum/elements/messages.html' %}
+        <p>{% blocktrans %}You can create custom collections to gather entries however you like!{% endblocktrans %}</p>
+        <table class="w3-table w3-table-all collections-list">
+            <thead>
+                <tr>
+                    <th>{% trans 'No.' %}</th>
+                    <th>{% trans 'Name' %}</th>
+                    <th>{% trans 'Entries' %}</th>
+                    <th>{% trans 'Type' %}</th>
+                    <th></th>
+                    <th style="text-align: right">
+                        <a href="{% url 'collection_create' %}" class="w3-btn button2">
+                            <span class="fa fa-plus"></span> <span class="w3-hide-small"> Add new</span>
+                        </a>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for collection in collections %}
+                <tr>
+                    <td class="narrow-col">{{ forloop.counter }}</td>
+                    <td><a href="{% url 'collection_details' collection.id %}" class="w3-large no-overflow">{{ collection.name|truncatechars_html:80 }}</a><br/><small class="no-overflow">{{ collection.description|safe|truncatewords_html:100 }}</small></td>
+                    <td class="narrow-col">{{ collection.entries.all.count }}</td>
+                    <td class="privacy-icon narrow-col">
+                        {% if collection.public %}
+                            <span class="fa fa-globe"></span>
+                        {% else %}
+                            <span class="fa fa-lock"></span>
+                        {% endif %}
+                    </td>
+                    <td class="narrow-col">
+                        <a href="{% url 'collection_edit' collection.id %}"
+                           class="">
+                            <span class="fa fa-pencil"></span><span class="w3-hide-small"> {% trans 'Edit' %}</span>
+                        </a>
+                    </td>
+                    <td class="narrow-col">
+                        <a href="{% url 'collection_delete' collection.id %}"
+                           class="">
+                            <span class="fa fa-trash-o"></span><span class="w3-hide-small"> {% trans 'Delete' %}</span>
+                        </a></td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </section>
+{% endblock %}
diff --git a/palanaeum/templates/palanaeum/collections/collection_remove_confirm.html b/palanaeum/templates/palanaeum/collections/collection_remove_confirm.html
new file mode 100644
index 0000000..9b8185c
--- /dev/null
+++ b/palanaeum/templates/palanaeum/collections/collection_remove_confirm.html
@@ -0,0 +1,23 @@
+{% extends 'palanaeum/one_column_layout.html' %}
+{% load i18n %}
+
+{% block page-header %}
+    {% trans 'Delete collection' %}
+{% endblock %}
+
+{% block page-title %}
+    {% trans 'Delete collection' %}
+{% endblock %}
+
+{% block one-column-content %}
+    <div class="w3-center w3-padding-bottom">
+        {% include 'palanaeum/elements/messages.html' %}
+        <p>{% trans 'Are you sure you want to delete this collection from the system?' %}</p>
+        <p><strong>{{ collection.name }}</strong> {% trans 'containing' %} {{ collection.entries.count }} {% trans 'entries.' %}</p>
+        <form action="{% url 'collection_delete' collection.id %}" method="post">
+            {% csrf_token %}
+            <input type="submit" class="w3-red w3-btn" value="{% trans 'Yes' %}">
+            <a href="{% url 'collections_list' %}" class="button1 w3-btn">{% trans 'No' %}</a>
+        </form>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/collections/collections_dialog.html b/palanaeum/templates/palanaeum/collections/collections_dialog.html
new file mode 100644
index 0000000..0a3cac7
--- /dev/null
+++ b/palanaeum/templates/palanaeum/collections/collections_dialog.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+<div id="collections-dialog" title="{% trans 'Add/remove to collections' %}">
+    <div class="collection-elem" id="collection-template" style="display: none">
+        <span class="collection-elem-symbol fa faded"></span>
+        <label><input type="checkbox" class="w3-check"><span class="collection-elem-text"></span></label>
+    </div>
+    <section id="collections-scroll-list">
+
+    </section>
+    <button id="add-collection-button" class="w3-btn w3-round button2"><span class="fa fa-plus"></span> {% trans 'Create collection' %}</button>
+    <section id="add-collection-input" style="display: none;">
+        <input type="text" title="Collection name" class="w3-round">
+        <button class="w3-btn w3-round button2"><span class="fa fa-plus"></span></button>
+    </section>
+</div>
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/elements/entry_li.html b/palanaeum/templates/palanaeum/elements/entry_li.html
index 1f2a41d..13c9ed3 100644
--- a/palanaeum/templates/palanaeum/elements/entry_li.html
+++ b/palanaeum/templates/palanaeum/elements/entry_li.html
@@ -6,11 +6,7 @@
                 <a href="{% url 'view_event_no_title' entry.event_id %}#e{{ entry.id }}" class="w3-left optionelement">
                     <b>{{ entry.event.name }} (<time datetime="{{ entry.event.date|date:"Y-m-d" }}">{{ entry.event.date|date }}</time>)</b>
                 </a>
-                <br>
             {% endif %}
-        <a href="{% url 'view_event_no_title' entry.event_id %}#e{{ entry.id }}">
-            <span class="w3-left optionelement faded">#{{ number }}</span>
-        </a>
             {% if rank and user.is_staff %}
                 <span class="w3-left optionelement faded">Rank: {{ rank|floatformat:4 }}</span>
             {% endif %}
@@ -22,21 +18,26 @@
                    data-class="entry" data-id="{{ entry.id }}"
                    title="{% if entry.is_visible %}{% trans 'Hide' %}{% else %}{% trans 'Show' %}{% endif %}">
                     <span class="hide_text">
-                        <span class="fa fa-eye-slash"></span><span class="w3-hide-small"> {% trans 'Hide' %}</span>
+                        <span class="fa fa-eye-slash"></span>
                     </span>
                     <span class="show_text">
-                        <span class="fa fa-eye"></span><span class="w3-hide-small"> {% trans 'Show' %}</span>
+                        <span class="fa fa-eye"></span>
                     </span>
                 </a>
             {% endif %}
             {% if entry.editable %}
-                <a href="{% url 'edit_entry' entry.id %}" class="optionelement faded">
-                    <span class="fa fa-pencil"></span><span class="w3-hide-small"> {% trans 'Edit' %}</span>
+                <a href="{% url 'edit_entry' entry.id %}" class="optionelement faded" title="{% trans 'Edit' %}">
+                    <span class="fa fa-pencil"></span>
                 </a>
             {% endif %}
             {% if user.is_staff %}
-                <a href="{% url 'remove_entry' entry.id %}" class="optionelement faded">
-                    <span class="fa fa-trash"></span><span class="w3-hide-small"> {% trans 'Remove' %}</span>
+                <a href="{% url 'remove_entry' entry.id %}" class="optionelement faded" title="{% trans 'Remove' %}">
+                    <span class="fa fa-trash"></span>
+                </a>
+            {% endif %}
+            {% if user.is_authenticated %}
+                <a href="" class="optionelement faded collection-button" title="{% trans 'Add/Remove to collection' %}" data-entry-id="{{ entry.id }}">
+                    <span class="fa fa-plus"></span> {% trans 'Save' %}
                 </a>
             {% endif %}
             <a href="{% url 'view_event_no_title' entry.event_id %}#e{{ entry.id }}" class="optionelement faded share-btn">
@@ -50,6 +51,10 @@
                     <span class="w3-tag w3-green">{% trans 'Suggestion' %}</span>
                 {% if user.is_staff %}</a>{% endif %}
             {% endif %}
+            <br/>
+            <a href="{% url 'view_event_no_title' entry.event_id %}#e{{ entry.id }}">
+                <span class="w3-left optionelement faded">#{{ number }}</span>
+            </a>
         </header>
     {% endif %}
     <div class="snippets">
diff --git a/palanaeum/templates/palanaeum/elements/event_details.html b/palanaeum/templates/palanaeum/elements/event_details.html
index ce9989f..91cfa94 100644
--- a/palanaeum/templates/palanaeum/elements/event_details.html
+++ b/palanaeum/templates/palanaeum/elements/event_details.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="w3-col m3 l3 w3-center eventDetails">
+<div class="w3-center eventDetails">
     <table class="w3-table-all w3-card">
         <caption class="w3-theme-l1 padTop padBottom">
             {% trans 'Event details' %}
@@ -99,4 +99,18 @@
             <span class="fa fa-random"></span> {% trans 'Sort entries' %}
         </a>
     {% endif %}
+    <div>
+        {% with prev_url=event.get_prev_url next_url=event.get_next_url %}
+            {% if prev_url %}
+                <a class="w3-btn button1 w3-padding w3-margin-top w3-round" href="{{ event.get_prev_url }}" style="width: 48%; float: left;">
+                    <span class="fa fa-chevron-left"></span> {% trans 'Previous event' %}
+                </a>
+            {% endif %}
+            {% if next_url %}
+                <a class="w3-btn button1 w3-padding w3-margin-top w3-round" href="{{ event.get_next_url }}" style="width: 48%; float: right">
+                    {% trans 'Next event' %} <span class="fa fa-chevron-right"></span>
+                </a>
+            {% endif %}
+        {% endwith %}
+    </div>
 </div>
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/elements/palanaeum_js_settings.html b/palanaeum/templates/palanaeum/elements/palanaeum_js_settings.html
index 532a734..6925fcb 100644
--- a/palanaeum/templates/palanaeum/elements/palanaeum_js_settings.html
+++ b/palanaeum/templates/palanaeum/elements/palanaeum_js_settings.html
@@ -9,6 +9,10 @@
         ENTRY_SAVE: "{% url 'save_entry' %}",
         SORT_ENTRIES: "{% url 'save_entries_order' %}",
 
+        COLLECTION_LIST_URL: "{% url 'collections_list_json' %}",
+        COLLECTION_ADD_REM_URL: "{% url 'collections_add_rem_entry' %}",
+        COLLECTION_CREATE_URL: "{% url 'collections_ajax_add_collection' %}",
+
         GET_URL_TEXT: "{% url 'get_url_text' %}",
 
         USER_IS_STAFF: {{ user.is_staff|yesno:"true, false" }},
diff --git a/palanaeum/templates/palanaeum/event.html b/palanaeum/templates/palanaeum/event.html
index 7811431..4ef60e8 100644
--- a/palanaeum/templates/palanaeum/event.html
+++ b/palanaeum/templates/palanaeum/event.html
@@ -24,13 +24,13 @@
 
 {% block one-column-content %}
     {% include 'palanaeum/elements/messages.html' %}
-    <div class="w3-row ">
-        <div class="w3-hide-medium w3-hide-large">
+    <div class="w3-row" style="display: flex; flex-direction: row; flex-wrap: wrap;">
+        <div class="w3-hide-medium w3-hide-large" style="flex-basis: 100%">
             {% block event-details-small %}
                 {% include 'palanaeum/elements/event_details.html' %}
             {% endblock %}
         </div>
-        <article class="w3-threequarter padTop w3-col m9 l9" id="eventArticle" data-event-id="{{ event.id }}">
+        <article class="padTop" id="eventArticle" data-event-id="{{ event.id }}" style="flex: 9; flex-basis: 75%">
             {% block event-nav %}
                 <nav class="w3-theme-l1 w3-bar w3-card" id="tab-nav">
                     <a href="javascript:void(0)" class="w3-hover-theme w3-theme-action w3-button w3-bar-item" data-tab-name="entries">{% trans 'Entries' %}</a>
@@ -57,10 +57,11 @@
                 {% endif %}
             </section>
         </article>
-        <div class="w3-hide-small">
+        <div class="w3-hide-small" style="flex: 2; flex-basis: 25%; position: -webkit-sticky; position: sticky; top: 50px; align-self: flex-start">
             {% block event-details-big %}
                 {% include 'palanaeum/elements/event_details.html' %}
             {% endblock %}
         </div>
     </div>
+    <div style="text-align: center" class="w3-small"><a href="#"><span class="fa fa-chevron-up"></span></a></div>
 {% endblock %}
\ No newline at end of file
diff --git a/palanaeum/templates/palanaeum/audio_source_edit.html b/palanaeum/templates/palanaeum/staff/audio_source_edit.html
similarity index 91%
rename from palanaeum/templates/palanaeum/audio_source_edit.html
rename to palanaeum/templates/palanaeum/staff/audio_source_edit.html
index 44c265c..f7644d3 100644
--- a/palanaeum/templates/palanaeum/audio_source_edit.html
+++ b/palanaeum/templates/palanaeum/staff/audio_source_edit.html
@@ -92,14 +92,18 @@ <h2>{% trans 'Manage snippets' %}</h2>
     </div>
     <div class="cascading-editor">
         <table class="w3-table-all w3-margin-bottom" id="snippets-table">
-            <tr>
-                <th>ID</th>
-                <th></th>
-                <th class="w3-center">{% trans 'Beginning' %}</th>
-                <th class="w3-center">{% trans 'Ending' %}</th>
-                <th class="w3-center">{% trans 'Snippet name' %}</th>
-                <th colspan="2" class="w3-center"></th> <!--Left intentionally blank-->
-            </tr>
+            <thead>
+                <tr>
+                    <th>ID</th>
+                    <th></th>
+                    <th class="w3-center">{% trans 'Beginning' %}</th>
+                    <th class="w3-center">{% trans 'Ending' %}</th>
+                    <th class="w3-center">{% trans 'Snippet name' %}</th>
+                    <th colspan="2" class="w3-center"></th> <!--Left intentionally blank-->
+                </tr>
+            </thead>
+            <tbody>
+            </tbody>
         </table>
     </div>
     <button type="button" style="display: none" class="w3-btn w3-right w3-margin-bottom button1 save"><span class="fa fa-save"></span> {% trans 'Save' %}</button>
diff --git a/palanaeum/templates/palanaeum/choose_source_type.html b/palanaeum/templates/palanaeum/staff/choose_source_type.html
similarity index 100%
rename from palanaeum/templates/palanaeum/choose_source_type.html
rename to palanaeum/templates/palanaeum/staff/choose_source_type.html
diff --git a/palanaeum/templates/palanaeum/delete_audio_file_confirm.html b/palanaeum/templates/palanaeum/staff/delete_audio_file_confirm.html
similarity index 100%
rename from palanaeum/templates/palanaeum/delete_audio_file_confirm.html
rename to palanaeum/templates/palanaeum/staff/delete_audio_file_confirm.html
diff --git a/palanaeum/templates/palanaeum/delete_entry_confirm.html b/palanaeum/templates/palanaeum/staff/delete_entry_confirm.html
similarity index 100%
rename from palanaeum/templates/palanaeum/delete_entry_confirm.html
rename to palanaeum/templates/palanaeum/staff/delete_entry_confirm.html
diff --git a/palanaeum/templates/palanaeum/delete_event_confirm.html b/palanaeum/templates/palanaeum/staff/delete_event_confirm.html
similarity index 100%
rename from palanaeum/templates/palanaeum/delete_event_confirm.html
rename to palanaeum/templates/palanaeum/staff/delete_event_confirm.html
diff --git a/palanaeum/templates/palanaeum/delete_image_source_confirm.html b/palanaeum/templates/palanaeum/staff/delete_image_source_confirm.html
similarity index 100%
rename from palanaeum/templates/palanaeum/delete_image_source_confirm.html
rename to palanaeum/templates/palanaeum/staff/delete_image_source_confirm.html
diff --git a/palanaeum/templates/palanaeum/edit_image_entry.html b/palanaeum/templates/palanaeum/staff/edit_image_entry.html
similarity index 100%
rename from palanaeum/templates/palanaeum/edit_image_entry.html
rename to palanaeum/templates/palanaeum/staff/edit_image_entry.html
diff --git a/palanaeum/templates/palanaeum/edit_snippet_entry.html b/palanaeum/templates/palanaeum/staff/edit_snippet_entry.html
similarity index 100%
rename from palanaeum/templates/palanaeum/edit_snippet_entry.html
rename to palanaeum/templates/palanaeum/staff/edit_snippet_entry.html
diff --git a/palanaeum/templates/palanaeum/entry_edit_form.html b/palanaeum/templates/palanaeum/staff/entry_edit_form.html
similarity index 100%
rename from palanaeum/templates/palanaeum/entry_edit_form.html
rename to palanaeum/templates/palanaeum/staff/entry_edit_form.html
diff --git a/palanaeum/templates/palanaeum/entry_history.html b/palanaeum/templates/palanaeum/staff/entry_history.html
similarity index 100%
rename from palanaeum/templates/palanaeum/entry_history.html
rename to palanaeum/templates/palanaeum/staff/entry_history.html
diff --git a/palanaeum/templates/palanaeum/event_edit_form.html b/palanaeum/templates/palanaeum/staff/event_edit_form.html
similarity index 100%
rename from palanaeum/templates/palanaeum/event_edit_form.html
rename to palanaeum/templates/palanaeum/staff/event_edit_form.html
diff --git a/palanaeum/templates/palanaeum/mute_snippet.html b/palanaeum/templates/palanaeum/staff/mute_snippet.html
similarity index 100%
rename from palanaeum/templates/palanaeum/mute_snippet.html
rename to palanaeum/templates/palanaeum/staff/mute_snippet.html
diff --git a/palanaeum/templates/palanaeum/sort_entries.html b/palanaeum/templates/palanaeum/staff/sort_entries.html
similarity index 100%
rename from palanaeum/templates/palanaeum/sort_entries.html
rename to palanaeum/templates/palanaeum/staff/sort_entries.html
diff --git a/palanaeum/templates/palanaeum/staff_cp.html b/palanaeum/templates/palanaeum/staff/staff_cp.html
similarity index 100%
rename from palanaeum/templates/palanaeum/staff_cp.html
rename to palanaeum/templates/palanaeum/staff/staff_cp.html
diff --git a/palanaeum/templates/palanaeum/staff_cp_suggestions.html b/palanaeum/templates/palanaeum/staff/staff_cp_suggestions.html
similarity index 96%
rename from palanaeum/templates/palanaeum/staff_cp_suggestions.html
rename to palanaeum/templates/palanaeum/staff/staff_cp_suggestions.html
index 645257a..c72a955 100644
--- a/palanaeum/templates/palanaeum/staff_cp_suggestions.html
+++ b/palanaeum/templates/palanaeum/staff/staff_cp_suggestions.html
@@ -1,4 +1,4 @@
-{% extends 'palanaeum/staff_cp.html' %}
+{% extends 'palanaeum/staff/staff_cp.html' %}
 {% load i18n %}
 {% load static %}
 
diff --git a/palanaeum/templates/palanaeum/upload_audio_page.html b/palanaeum/templates/palanaeum/staff/upload_audio_page.html
similarity index 100%
rename from palanaeum/templates/palanaeum/upload_audio_page.html
rename to palanaeum/templates/palanaeum/staff/upload_audio_page.html
diff --git a/palanaeum/templates/palanaeum/upload_images_page.html b/palanaeum/templates/palanaeum/staff/upload_images_page.html
similarity index 100%
rename from palanaeum/templates/palanaeum/upload_images_page.html
rename to palanaeum/templates/palanaeum/staff/upload_images_page.html
diff --git a/palanaeum/templates/palanaeum/tags_list.html b/palanaeum/templates/palanaeum/tags_list.html
index 380b932..6e535a7 100644
--- a/palanaeum/templates/palanaeum/tags_list.html
+++ b/palanaeum/templates/palanaeum/tags_list.html
@@ -10,39 +10,47 @@
         <section>
             <h2>{% trans 'Entry tags' %}</h2>
             <table class="w3-table-all">
-                <tr>
-                    <th>#</th>
-                    <th>{% trans 'Tags' %}</th>
-                </tr>
-            {% for score, tags in entry_tags %}
-                <tr>
-                    <th>{{ score }}</th>
-                    <td>
-                        {% for tag in tags %}
-                            <span class="w3-tag tag">{{ tag.as_link|safe }}</span>
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endfor %}
+                <thead>
+                    <tr>
+                        <th>#</th>
+                        <th>{% trans 'Tags' %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for score, tags in entry_tags %}
+                        <tr>
+                            <th>{{ score }}</th>
+                            <td>
+                                {% for tag in tags %}
+                                    <span class="w3-tag tag">{{ tag.as_link|safe }}</span>
+                                {% endfor %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
             </table>
         </section>
         <section>
             <h2>{% trans 'Event tags' %}</h2>
             <table class="w3-table-all">
-                <tr>
-                    <th>#</th>
-                    <th>{% trans 'Tags' %}</th>
-                </tr>
-            {% for score, tags in event_tags %}
-                <tr>
-                    <th>{{ score }}</th>
-                    <td>
-                        {% for tag in tags %}
-                            <span class="w3-tag  tag">{{ tag.as_link|safe }}</span>
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endfor %}
+                <thead>
+                    <tr>
+                        <th>#</th>
+                        <th>{% trans 'Tags' %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for score, tags in event_tags %}
+                        <tr>
+                            <th>{{ score }}</th>
+                            <td>
+                                {% for tag in tags %}
+                                    <span class="w3-tag  tag">{{ tag.as_link|safe }}</span>
+                                {% endfor %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
             </table>
         </section>
     </div>
diff --git a/palanaeum/tests.py b/palanaeum/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/palanaeum/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/palanaeum/tests/__init__.py b/palanaeum/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/palanaeum/tests/factories.py b/palanaeum/tests/factories.py
new file mode 100644
index 0000000..33ac51f
--- /dev/null
+++ b/palanaeum/tests/factories.py
@@ -0,0 +1,30 @@
+from datetime import date
+
+import factory
+from django.contrib.auth.models import User
+
+from palanaeum.models import Event, Entry
+
+
+class UserFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = User
+
+    username = factory.Sequence(lambda n: "User {}".format(n))
+    email = factory.Sequence(lambda n: "user{}@palanaeum.org".format(n))
+
+
+class EventFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = Event
+
+    name = factory.Sequence(lambda n: 'Test event {}'.format(n))
+    date = date.today()
+    modified_by = None
+
+
+class EntryFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = Entry
+
+    event = factory.SubFactory(EventFactory)
diff --git a/palanaeum/tests/test_index.py b/palanaeum/tests/test_index.py
new file mode 100644
index 0000000..9d5fe39
--- /dev/null
+++ b/palanaeum/tests/test_index.py
@@ -0,0 +1,25 @@
+from django.test import TestCase
+
+from palanaeum.tests.factories import EventFactory, EntryFactory
+
+
+class IndexTests(TestCase):
+
+    def test_empty_page(self):
+        ret = self.client.get('/')
+        self.assertEqual(ret.status_code, 200)
+        self.assertInHTML('There are no events in the system yet.',
+                          ret.content.decode())
+
+    def test_index_events(self):
+        event = EventFactory()
+        ret = self.client.get('/')
+        self.assertEqual(ret.status_code, 200)
+        # No entries = event invisible on index page
+        self.assertNotIn(event.name, ret.content.decode())
+
+        # Adding entry to make event visible on index page
+        EntryFactory(event=event)
+        ret = self.client.get('/')
+        self.assertEqual(ret.status_code, 200)
+        self.assertInHTML(event.name, ret.content.decode())
diff --git a/palanaeum/tests/test_models.py b/palanaeum/tests/test_models.py
new file mode 100644
index 0000000..04100d1
--- /dev/null
+++ b/palanaeum/tests/test_models.py
@@ -0,0 +1,40 @@
+from datetime import date
+
+from django.test import TestCase
+from django.urls import reverse
+from django.utils.text import slugify
+
+from palanaeum.tests.factories import EventFactory, EntryFactory
+
+
+class EventTests(TestCase):
+    def setUp(self):
+        self.event1 = EventFactory(date=date(2018, 5, 3))
+        self.event2 = EventFactory(date=date(2018, 5, 2))
+        self.event3 = EventFactory(date=date(2018, 5, 1))
+        # Make events visible
+        EntryFactory(event=self.event1)
+        EntryFactory(event=self.event2)
+        EntryFactory(event=self.event3)
+
+    def test_prev_url(self):
+        self.assertEqual(
+            self.event1.get_prev_url(),
+            None
+        )
+
+        self.assertEqual(
+            self.event2.get_prev_url(),
+            reverse('view_event', args=(self.event1.pk, slugify(self.event1.name)))
+        )
+
+    def test_next_url(self):
+        self.assertEqual(
+            self.event3.get_next_url(),
+            None
+        )
+
+        self.assertEqual(
+            self.event2.get_next_url(),
+            reverse('view_event', args=(self.event3.pk, slugify(self.event3.name)))
+        )
diff --git a/palanaeum/urls.py b/palanaeum/urls.py
index b9dde5e..5b831a3 100644
--- a/palanaeum/urls.py
+++ b/palanaeum/urls.py
@@ -104,6 +104,15 @@
     path('tags/', views.tags_list, name="tags_list"),
     path('adv_search/', views.adv_search, name="advanced_search"),
 
+    path('collections/create/', views.edit_collection, name="collection_create"),
+    path('collections/ajax/get/', views.get_collection_list_json, name="collections_list_json"),
+    path('collections/ajax/edit/', views.switch_entry_in_collection, name="collections_add_rem_entry"),
+    path('collections/ajax/create/', views.ajax_add_collection, name="collections_ajax_add_collection"),
+    path('collections/<int:collection_id>/', views.show_collection, name="collection_details"),
+    path('collections/<int:collection_id>/edit/', views.edit_collection, name="collection_edit"),
+    path('collections/<int:collection_id>/delete/', views.delete_collection, name="collection_delete"),
+    path('collections/', views.show_collection_list, name="collections_list"),
+
     path('admin/', admin_views.index, name="admin_index"),
     path('admin/config/', admin_views.config, name="admin_config"),
     path('admin/config/reset_favicons/', admin_views.reset_favicons, name="admin_config_reset_favicons"),
diff --git a/palanaeum/views.py b/palanaeum/views.py
index 447b422..d105ebe 100644
--- a/palanaeum/views.py
+++ b/palanaeum/views.py
@@ -13,13 +13,14 @@
 from django.utils import timezone
 from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
+from django.views.decorators.http import require_POST
 
 from palanaeum.configuration import get_config
-from palanaeum.decorators import json_response
+from palanaeum.decorators import json_response, AjaxException
 from palanaeum.forms import UserCreationFormWithEmail, UserSettingsForm, \
-    EmailChangeForm, SortForm
+    EmailChangeForm, SortForm, UsersEntryCollectionForm
 from palanaeum.models import UserSettings, Event, \
-    AudioSource, Entry, Tag, ImageSource, RelatedSite
+    AudioSource, Entry, Tag, ImageSource, RelatedSite, UsersEntryCollection
 from palanaeum.search import init_filters, execute_filters, get_search_results, \
     paginate_search_results
 from palanaeum.utils import is_contributor
@@ -189,6 +190,161 @@ def user_settings(request):
     return render(request, 'palanaeum/auth/settings.html', {'settings_form': settings_form, 'email_form': email_form})
 
 
+@login_required(login_url='auth_login')
+def show_collection_list(request):
+    """
+    Displays a list of user collections owned by current user.
+    """
+    collections = UsersEntryCollection.objects.filter(user=request.user)
+
+    return render(request, 'palanaeum/collections/collection_list.html', {'collections': collections})
+
+
+def show_collection(request, collection_id):
+    """
+    Check if user can view this collections and display it.
+    """
+    collection = get_object_or_404(UsersEntryCollection, pk=collection_id)
+
+    if not (collection.public or collection.user == request.user or request.user.is_superuser):
+        messages.error(request, _('You are not allowed to see this collection.'))
+        return redirect('index')
+    elif collection.user != request.user and request.user.is_superuser:
+        messages.info(request, _('You are viewing a private collection as superuser.'))
+
+    entries_ids = collection.entries.all().values_list('id', flat=True)
+    entries = Entry.prefetch_entries(entries_ids)
+    entries = [entries[eid] for eid in entries_ids]
+
+    return render(request, 'palanaeum/collections/collection.html',
+                  {'entries': entries, 'collection': collection,
+                   'is_owner': collection.user == request.user})
+
+
+@login_required(login_url='auth_login')
+def edit_collection(request, collection_id=None):
+    """
+    Display collection edit form allowing user to edit it's name, description
+    and visibility.
+    """
+    if collection_id:
+        collection = get_object_or_404(UsersEntryCollection, pk=collection_id)
+
+        if collection.user != request.user:
+            messages.error(request, _('You are not allowed to edit this collection.'))
+            return redirect('index')
+    else:
+        collection = UsersEntryCollection(user=request.user)
+
+    if request.method == 'POST':
+        form = UsersEntryCollectionForm(request.POST, instance=collection)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _('Collection saved successfully.'))
+            return redirect('collections_list')
+        messages.error(request, _('There were problems while saving your collection.'))
+    else:
+        form = UsersEntryCollectionForm(instance=collection)
+
+    return render(request, 'palanaeum/collections/collection_edit.html',
+                  {'form': form, 'collection': collection, 'new_collection': collection_id is None})
+
+
+@login_required(login_url='auth_login')
+def delete_collection(request, collection_id):
+    """
+    Display a page asking for confirmation that you want to delete the collection. Delete if
+    it's confirmed.
+    """
+    collection = get_object_or_404(UsersEntryCollection, pk=collection_id)
+
+    if collection.user != request.user and not request.user.is_superuser:
+        messages.error(request, _('You are not allowed to delete this collection.'))
+        return redirect('index')
+
+    if request.method == 'POST':
+        collection.delete()
+        messages.success(request, _('Collection removed successfully.'))
+        return redirect('collections_list')
+
+    return render(request, 'palanaeum/collections/collection_remove_confirm.html',
+                  {'collection': collection})
+
+
+@json_response
+@login_required(login_url='auth_login')
+def get_collection_list_json(request):
+    entry_id = request.GET.get('entry_id', None)
+
+    collections = UsersEntryCollection.objects.filter(user=request.user)
+
+    ret = []
+
+    for collection in collections:
+        ret.append({
+            'id': collection.id,
+            'name': collection.name if len(collection.name) < 30 else collection.name[:27] + '...',
+            'size': collection.entries.count(),
+            'has_entry': collection.entries.filter(pk=entry_id).exists(),
+            'public': collection.public,
+        })
+
+    return {'success': True, 'list': ret}
+
+
+@require_POST
+@json_response
+@login_required(login_url='auth_login')
+def switch_entry_in_collection(request):
+    try:
+        entry_id = int(request.POST['entry_id'])
+        entry = get_object_or_404(Entry, pk=entry_id)
+        collection_id = int(request.POST['collection_id'])
+        collection = get_object_or_404(UsersEntryCollection, pk=collection_id)
+        action = request.POST['action']
+        assert(action in ('add', 'remove'))
+    except KeyError:
+        raise AjaxException('Missing required POST parameter (entry_id, collection_id and action are required).')
+    except (TypeError, ValueError):
+        raise AjaxException('The id parameter must contain an integer.')
+    except AssertionError:
+        raise AjaxException('Invalid action.')
+
+    if collection.user != request.user and not request.user.is_superuser:
+        raise AjaxException('You are not allowed to do this!')
+
+    if action == 'add':
+        collection.entries.add(entry)
+    else:
+        collection.entries.remove(entry)
+
+    return {'success': True, 'size': collection.entries.count(),
+            'name': collection.name if len(collection.name) < 30 else collection.name[:27] + '...',
+            'public': collection.public}
+
+
+@require_POST
+@json_response
+@login_required(login_url='auth_login')
+def ajax_add_collection(request):
+    try:
+        name = request.POST['name'][:UsersEntryCollection.MAX_NAME_LENGTH]
+        entry_id = int(request.POST['entry_id'])
+        entry = get_object_or_404(Entry, pk=entry_id)
+    except KeyError:
+        raise AjaxException('Missing required POST parameter (name and entry_id required).')
+    except (TypeError, ValueError):
+        raise AjaxException('The id parameter must contain an integer.')
+
+    collection = UsersEntryCollection.objects.create(
+        user=request.user, name=name, public=False
+    )
+
+    collection.entries.add(entry)
+
+    return {'success': True, 'name': name, 'id': collection.id}
+
+
 def adv_search(request):
     """
     Display an advances search form + search results.
diff --git a/requirements.txt b/requirements.txt
index 35ed09a..79f56b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-Django == 2.0.2
-django-extensions==1.9.9
+Django >= 2.0.4
+django-extensions>=1.9.9
 pytz>=2016.6.1
 celery>=4.1.0
 Werkzeug>=0.14.1
@@ -15,4 +15,5 @@ requests-toolbelt>=0.8.0
 lxml>=4.1.0
 djangorestframework>=3.7.7
 markdown>=2.6.11
-django-filter>=1.1.0
\ No newline at end of file
+django-filter>=1.1.0
+factory_boy>=2.10.0
\ No newline at end of file