diff --git a/todo/forms.py b/todo/forms.py
index 756e5c8..8937765 100644
--- a/todo/forms.py
+++ b/todo/forms.py
@@ -13,6 +13,8 @@ class AddTaskListForm(ModelForm):
     def __init__(self, user, *args, **kwargs):
         super(AddTaskListForm, self).__init__(*args, **kwargs)
         self.fields['group'].queryset = Group.objects.filter(user=user)
+        self.fields['group'].widget.attrs = {
+            'id': 'id_group', 'class': "custom-select mb-3", 'name': 'group'}
 
     class Meta:
         model = TaskList
@@ -25,7 +27,7 @@ class AddEditItemForm(ModelForm):
 
     def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['assigned_to'].queryset = get_user_model().objects.filter(groups__in=user.groups.all())
+        self.fields['assigned_to'].queryset = get_user_model().objects.filter(groups__in=user.groups.all()).distinct()
         self.fields['assigned_to'].label_from_instance = lambda obj: "%s (%s)" % (obj.get_full_name(), obj.username)
         self.fields['assigned_to'].widget.attrs = {
             'id': 'id_assigned_to', 'class': "custom-select mb-3", 'name': 'assigned_to'}
diff --git a/todo/templates/todo/add_list.html b/todo/templates/todo/add_list.html
index 9d44224..3eaaa46 100644
--- a/todo/templates/todo/add_list.html
+++ b/todo/templates/todo/add_list.html
@@ -21,12 +21,7 @@
     </div>
     <div class="form-group">
       <label for="id_group">Group</label>
-      <select id="id_group" name ="group" class="custom-select size="3" mb-3">
-        {% for g in form.group  %}
-          {{ g }}
-          <option value="{{ g.id }}">{{ g.name }}</option>
-        {% endfor %}
-      </select>
+      {{form.group}}
     </div>
 
     <button type="submit" class="btn btn-primary">Submit</button>
diff --git a/todo/templates/todo/include/task_edit.html b/todo/templates/todo/include/task_edit.html
index 8139c16..d0fbe1e 100644
--- a/todo/templates/todo/include/task_edit.html
+++ b/todo/templates/todo/include/task_edit.html
@@ -27,7 +27,7 @@
 
     <div class="form-group">
       <label for="id_assigned_to">Assigned To</label>
-      {# See todo.forms.AddItemForm #}
+      {# See todo.forms.AddEditItemForm #}
       {{form.assigned_to}}
     </div>
 
diff --git a/todo/templates/todo/list_lists.html b/todo/templates/todo/list_lists.html
index 88c0a09..5176325 100644
--- a/todo/templates/todo/list_lists.html
+++ b/todo/templates/todo/list_lists.html
@@ -10,7 +10,7 @@
   {% regroup lists by group as section_list %}
   {% for group in section_list %}
     <h3>Group: {{ group.grouper }}</h3>
-    <ul class="list-group">
+    <ul class="list-group mb-4">
       {% for item in group.list %}
       <li class="list-group-item d-flex justify-content-between align-items-center">
         <a href="{% url 'todo:list_detail' item.id item.slug %}">{{ item.name }}</a>