diff --git a/app/blueprints/collections/__init__.py b/app/blueprints/collections/__init__.py
index 0aa58a59..70f15785 100644
--- a/app/blueprints/collections/__init__.py
+++ b/app/blueprints/collections/__init__.py
@@ -179,12 +179,12 @@ def handle_create_edit(collection: Collection, form: CollectionForm,
 		form.populate_obj(collection)
 		collection.name = name
 
-		item_lookup = {}
+		link_lookup = {}
 		for link in collection.items:
-			item_lookup[link.package.get_id()] = link
+			link_lookup[link.package.get_id()] = link
 
 		for i, package_id in enumerate(form.package_ids):
-			link = next((x for x in collection.items if str(x.package.get_id()) == package_id.data), None)
+			link = link_lookup.get(package_id.data)
 			to_delete = form.package_removed[i].data == "1"
 			if link is None:
 				if to_delete:
@@ -198,7 +198,7 @@ def handle_create_edit(collection: Collection, form: CollectionForm,
 				link.package = package
 				link.collection = collection
 				link.description = form.descriptions[i].data
-				item_lookup[link.package.get_id()] = link
+				link_lookup[link.package.get_id()] = link
 				db.session.add(link)
 			elif to_delete:
 				db.session.delete(link)
@@ -206,7 +206,7 @@ def handle_create_edit(collection: Collection, form: CollectionForm,
 				link.description = form.descriptions[i].data
 
 		for i, package_id in enumerate(form.order.data.split(",")):
-			item_lookup[package_id].order = i + 1
+			link_lookup[package_id].order = i + 1
 
 		add_audit_log(severity, current_user,
 				f"Edited collection {collection.author.username}/{collection.name}",
diff --git a/app/public/static/collection_editor.js b/app/public/static/collection_editor.js
index 9df63949..079ed8bb 100644
--- a/app/public/static/collection_editor.js
+++ b/app/public/static/collection_editor.js
@@ -74,25 +74,32 @@ function addPackage(pkg) {
 	temp.innerHTML = `
 		<article class="card my-3" data-id="${escapeHtml(id)}">
 			<div class="card-body">
-				<button class="btn btn-sm btn-danger remove-package float-right" type="button" aria-label="Remove">
-					<i class="fas fa-trash"></i>
-				</button>
-				<h5>
-					<a href="${escapeHtml(url)}" target="_blank">
-						${escapeHtml(pkg.title)} by ${escapeHtml(pkg.author)}
-					</a>
-				</h5>
-				<p class="text-muted">
-					${escapeHtml(pkg.short_description)}
-				</p>
-				<div class="form-group">
-					<label for="descriptions-${nextId}">Short Description</label>
-					<input class="form-control" id="descriptions-${nextId}" maxlength="500" minlength="0"
-						name="descriptions-${nextId}" type="text" value="">
-					<small class="form-text text-muted">You can replace the description with your own</small>
+				<div class="row">
+					<div class="col-auto text-muted pr-2">
+						<i class="fas fa-bars"></i>
+					</div>
+					<div class="col">
+						<button class="btn btn-sm btn-danger remove-package float-right" type="button" aria-label="Remove">
+							<i class="fas fa-trash"></i>
+						</button>
+						<h5>
+							<a href="${escapeHtml(url)}" target="_blank">
+								${escapeHtml(pkg.title)} by ${escapeHtml(pkg.author)}
+							</a>
+						</h5>
+						<p class="text-muted">
+							${escapeHtml(pkg.short_description)}
+						</p>
+						<div class="form-group">
+							<label for="descriptions-${nextId}">Short Description</label>
+							<input class="form-control" id="descriptions-${nextId}" maxlength="500" minlength="0"
+								name="descriptions-${nextId}" type="text" value="">
+							<small class="form-text text-muted">You can replace the description with your own</small>
+						</div>
+						<input id="package_ids-${nextId}" name="package_ids-${nextId}" type="hidden" value="${id}">
+						<input id="package_removed-${nextId}" name="package_removed-${nextId}" type="hidden" value="0">
+					</div>
 				</div>
-				<input id="package_ids-${nextId}" name="package_ids-${nextId}" type="hidden" value="${id}">
-				<input id="package_removed-${nextId}" name="package_removed-${nextId}" type="hidden" value="0">
 			</div>
 		</article>
 	`;
diff --git a/app/templates/collections/create_edit.html b/app/templates/collections/create_edit.html
index 60a00f46..d8b40409 100644
--- a/app/templates/collections/create_edit.html
+++ b/app/templates/collections/create_edit.html
@@ -10,7 +10,7 @@
 
 {% block scriptextra %}
 	<script src="/static/libs/jquery-ui.min.js"></script>
-	<script src="/static/collection_editor.js?v=6"></script>
+	<script src="/static/collection_editor.js?v=7"></script>
 {% endblock %}
 
 {% block content %}