diff --git a/app/components/app-link.imba b/app/components/app-link.imba
index ff03d99..489e900 100644
--- a/app/components/app-link.imba
+++ b/app/components/app-link.imba
@@ -1,54 +1,52 @@
 tag app-link
 
 	def render
-		<self>
+		<self
+			@pointerover=set_selection_index(index)
+			@click.prevent=handle_click_link(link)
+			.selected=(index is selection_index)
+		>
 			css d:flex fld:row jc:space-between ai:center
 				px:16px py:11px rd:5px cursor:pointer c:blue3
 
-			<.link
-				@pointerover=(selection_index = index)
-				@click.prevent=handle_click_link(link)
-				.selected=(index is selection_index)
-			>
+			<.link-left>
+				css d:flex fl:1
 
-				<.link-left>
-					css d:flex fl:1
+				<img.link-icon src=data.icon>
+					css w:20px h:20px mr:10px rd:3px
 
-					<img.link-icon src=data.icon>
-						css w:20px h:20px mr:10px rd:3px
+				<.display-name [c:#FAD4AB]=data.is_bang> data.display_name
+					css tt:capitalize fs:20px overflow-wrap:anywhere
 
-					<.display-name [c:#FAD4AB]=data.is_bang> data.display_name
-						css tt:capitalize fs:20px overflow-wrap:anywhere
+				if data.display_name isnt data.name and config.data.enable_effective_names
+					<.name>
+						css d:flex ja:center c:gray4 ml:10px fs:14px
+						css .parens fs:10px c:gray4/80
 
-					if data.display_name isnt data.name and config.data.enable_effective_names
-						<.name>
-							css d:flex ja:center c:gray4 ml:10px fs:14px
-							css .parens fs:10px c:gray4/80
+						<span.parens> "("
+						<span> data.name
+						<span.parens> ")"
 
-							<span.parens> "("
-							<span> data.name
-							<span.parens> ")"
+			<.link-right>
+				css d:flex fld:row jc:space-between ai:center
+				css .buttons-disabled .link-button visibility:hidden
+				css .selected .link-button visibility:visible
 
-				<.link-right>
-					css d:flex fld:row jc:space-between ai:center
-					css .buttons-disabled .link-button visibility:hidden
-					css .selected .link-button visibility:visible
+				<.link-buttons .buttons-disabled=!config.data.enable_buttons>
+					css d:flex fld:row jc:flex-start ai:center pr:25px gap:5px
+					css .link-button visibility:hidden rd:3px c:purple4 fs:15px cursor:pointer px:3px
+					css .link-button svg w:15px
 
-					<.link-buttons .buttons-disabled=!config.data.enable_buttons>
-						css d:flex fld:row jc:flex-start ai:center pr:25px gap:5px
-						css .link-button visibility:hidden rd:3px c:purple4 fs:15px cursor:pointer px:3px
-						css .link-button svg w:15px
+					<.link-button@click.prevent.stop=handle_click_edit(link)>
+						<svg src='../assets/edit-2.svg'>
 
-						<.link-button@click.prevent.stop=handle_click_edit(link)>
-							<svg src='../assets/edit-2.svg'>
+					<.link-button@click.prevent.stop=handle_click_delete(link)>
+						<svg src='../assets/trash.svg'>
 
-						<.link-button@click.prevent.stop=handle_click_delete(link)>
-							<svg src='../assets/trash.svg'>
+					<.link-button
+						@click.prevent.stop=handle_click_pin(link)
+						[visibility:visible c:purple3/50]=(data.is_pinned and (index isnt selection_index or not config.data.enable_buttons))
+					> <svg src='../assets/star.svg'>
 
-						<.link-button
-							@click.prevent.stop=handle_click_pin(link)
-							[visibility:visible c:purple3/50]=(data.is_pinned and (index isnt selection_index or not config.data.enable_buttons))
-						> <svg src='../assets/star.svg'>
-
-					<.frequency> data.frequency
-						css fs:15px ml:7px
+				<.frequency> data.frequency
+					css fs:15px ml:7px
diff --git a/app/components/app-links.imba b/app/components/app-links.imba
index 57b5b79..9be9fb4 100644
--- a/app/components/app-links.imba
+++ b/app/components/app-links.imba
@@ -228,4 +228,9 @@ tag app-links
 						<app-bang data=active_bang>
 					else
 						for link, index in state.sorted_links
-							<app-link data=link index=index>
+							<app-link
+								data=link
+								set_selection_index=(do |index| selection_index = index)
+								index=index
+								selection_index=selection_index
+							>