diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index e03398d..7e0522d 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -30,21 +30,21 @@
 			</button>
 		</header>
 		<div class="sidebar__content" @keydown="handleSidebarKeydown">
-			<ServerList v-if="serverCount > 1" v-show="mapsVisible"></ServerList>
-			<WorldList v-if="mapCount > 1" v-show="mapsVisible"></WorldList>
-			<PlayerList id="players" v-if="playerMakersEnabled && previouslyVisible.has('players')"
-			            v-show="playersVisible"></PlayerList>
-			<FollowTarget v-if="following" v-show="followVisible" :target="following"></FollowTarget>
+			<ServersSection v-if="serverCount > 1" v-show="mapsVisible"></ServersSection>
+			<WorldsSection v-if="mapCount > 1" v-show="mapsVisible"></WorldsSection>
+			<PlayersSection id="players" v-if="playerMakersEnabled && previouslyVisible.has('players')"
+			            v-show="playersVisible"></PlayersSection>
+			<FollowTargetSection v-if="following" v-show="followVisible" :target="following"></FollowTargetSection>
 		</div>
 	</section>
 </template>
 
 <script lang="ts">
 import {computed, defineComponent} from "@vue/runtime-core";
-import PlayerList from './sidebar/PlayerList.vue';
-import WorldList from './sidebar/WorldList.vue';
-import ServerList from "@/components/sidebar/ServerList.vue";
-import FollowTarget from './sidebar/FollowTarget.vue';
+import FollowTargetSection from './sidebar/FollowTargetSection.vue';
+import PlayersSection from "@/components/sidebar/PlayersSection.vue";
+import ServersSection from "@/components/sidebar/ServersSection.vue";
+import WorldsSection from "@/components/sidebar/WorldsSection.vue";
 import {useStore} from "@/store";
 import SvgIcon from "@/components/SvgIcon.vue";
 import {MutationTypes} from "@/store/mutation-types";
@@ -57,11 +57,11 @@ import {focus} from "@/util";
 
 export default defineComponent({
 	components: {
-		ServerList,
+		WorldsSection,
+		ServersSection,
+		PlayersSection,
+		FollowTargetSection,
 		SvgIcon,
-		PlayerList,
-		FollowTarget,
-		WorldList,
 	},
 
 	setup() {
diff --git a/src/components/list/PlayerList.vue b/src/components/list/PlayerList.vue
new file mode 100644
index 0000000..fb5ad0b
--- /dev/null
+++ b/src/components/list/PlayerList.vue
@@ -0,0 +1,41 @@
+<!--
+  - Copyright 2022 James Lyne
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  - http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+  -->
+
+<template>
+	<RadioList v-if="players.length">
+		<PlayerListItem v-for="player in players" :key="player.name" :player="player"></PlayerListItem>
+	</RadioList>
+</template>
+
+<script lang="ts">
+import PlayerListItem from "./PlayerListItem.vue";
+import {defineComponent} from "@vue/runtime-core";
+import RadioList from "@/components/util/RadioList.vue";
+import {LiveAtlasPlayer} from "@/index";
+
+export default defineComponent({
+	components: {
+		RadioList,
+		PlayerListItem
+	},
+	props: {
+		players: {
+			type: Object as () => LiveAtlasPlayer[],
+			required: true,
+		}
+	}
+});
+</script>
diff --git a/src/components/sidebar/PlayerListItem.vue b/src/components/list/PlayerListItem.vue
similarity index 100%
rename from src/components/sidebar/PlayerListItem.vue
rename to src/components/list/PlayerListItem.vue
diff --git a/src/components/list/ServerList.vue b/src/components/list/ServerList.vue
new file mode 100644
index 0000000..d7ec69a
--- /dev/null
+++ b/src/components/list/ServerList.vue
@@ -0,0 +1,43 @@
+<!--
+  - Copyright 2022 James Lyne
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  - http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+  -->
+
+<template>
+	<RadioList aria-labelledby="servers-heading">
+		<ServerListItem :server="server" v-for="[name, server] in servers" :key="name"></ServerListItem>
+	</RadioList>
+</template>
+
+<script lang="ts">
+import ServerListItem from './ServerListItem.vue';
+import {defineComponent} from 'vue';
+import RadioList from "@/components/util/RadioList.vue";
+import {LiveAtlasServerDefinition} from "@/index";
+
+export default defineComponent({
+	name: 'ServerList',
+	components: {
+		RadioList,
+		ServerListItem
+	},
+
+	props: {
+		servers: {
+			type: Object as () => Map<string, LiveAtlasServerDefinition>,
+			required: true
+		}
+	}
+});
+</script>
diff --git a/src/components/sidebar/ServerListItem.vue b/src/components/list/ServerListItem.vue
similarity index 100%
rename from src/components/sidebar/ServerListItem.vue
rename to src/components/list/ServerListItem.vue
diff --git a/src/components/list/WorldList.vue b/src/components/list/WorldList.vue
new file mode 100644
index 0000000..b46227b
--- /dev/null
+++ b/src/components/list/WorldList.vue
@@ -0,0 +1,58 @@
+<!--
+  - Copyright 2022 James Lyne
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  - http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+  -->
+
+<template>
+	<RadioList v-if="worlds.size" aria-labelledby="maps-heading">
+		<WorldListItem :world="world" v-for="[name, world] in worlds" :key="`${prefix}_${currentServer}_${name}`"></WorldListItem>
+	</RadioList>
+</template>
+
+<script lang="ts">
+import WorldListItem from './WorldListItem.vue';
+import {defineComponent} from 'vue';
+import RadioList from "@/components/util/RadioList.vue";
+import {LiveAtlasWorldDefinition} from "@/index";
+import {useStore} from "@/store";
+import {computed} from "@vue/runtime-core";
+
+export default defineComponent({
+	name: 'WorldList',
+	components: {
+		RadioList,
+		WorldListItem
+	},
+
+	props: {
+		prefix: {
+			type: String,
+			default: 'map',
+		},
+		worlds: {
+			type: Object as () => Map<string, LiveAtlasWorldDefinition>,
+			required: true,
+		}
+	},
+
+	setup() {
+		const store = useStore(),
+			currentServer = computed(() => store.state.currentServer ? store.state.currentServer.id : undefined);
+
+		return {
+			currentServer
+		}
+	}
+});
+</script>
diff --git a/src/components/sidebar/WorldListItem.vue b/src/components/list/WorldListItem.vue
similarity index 100%
rename from src/components/sidebar/WorldListItem.vue
rename to src/components/list/WorldListItem.vue
diff --git a/src/components/map/MapContextMenu.vue b/src/components/map/MapContextMenu.vue
index 825a935..9975150 100644
--- a/src/components/map/MapContextMenu.vue
+++ b/src/components/map/MapContextMenu.vue
@@ -45,7 +45,7 @@ import LiveAtlasLeafletMap from "@/leaflet/LiveAtlasLeafletMap";
 import {computed, defineComponent, onMounted, onUnmounted, watch} from "@vue/runtime-core";
 import {LeafletMouseEvent} from "leaflet";
 import {useStore} from "@/store";
-import WorldListItem from "@/components/sidebar/WorldListItem.vue";
+import WorldListItem from "@/components/list/WorldListItem.vue";
 import {CSSProperties, ref} from "vue";
 import {clipboardError, clipboardSuccess, getUrlForLocation} from "@/util";
 import {nextTick} from 'vue';
diff --git a/src/components/sidebar/FollowTarget.vue b/src/components/sidebar/FollowTargetSection.vue
similarity index 99%
rename from src/components/sidebar/FollowTarget.vue
rename to src/components/sidebar/FollowTargetSection.vue
index fab891a..e885195 100644
--- a/src/components/sidebar/FollowTarget.vue
+++ b/src/components/sidebar/FollowTargetSection.vue
@@ -44,7 +44,7 @@ import SvgIcon from "@/components/SvgIcon.vue";
 import "@/assets/icons/cross.svg";
 
 export default defineComponent({
-	name: 'FollowTarget',
+	name: 'FollowTargetSection',
 	components: {SvgIcon},
 	props: {
 		target: {
diff --git a/src/components/sidebar/PlayerList.vue b/src/components/sidebar/PlayersSection.vue
similarity index 87%
rename from src/components/sidebar/PlayerList.vue
rename to src/components/sidebar/PlayersSection.vue
index 67888f1..8418207 100644
--- a/src/components/sidebar/PlayerList.vue
+++ b/src/components/sidebar/PlayersSection.vue
@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2021 James Lyne
+  - Copyright 2022 James Lyne
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@
 		<template v-slot:default>
 			<input v-if="players && searchEnabled" id="players__search" type="text" name="search"
 			       v-model="searchQuery" :placeholder="messagePlayersSearchPlaceholder" @keydown="onKeydown">
-			<RadioList v-if="filteredPlayers.length" aria-labelledby="players-heading">
-				<PlayerListItem v-for="player in filteredPlayers" :key="player.name"
-				                :player="player"></PlayerListItem>
-			</RadioList>
+			<PlayerList v-if="filteredPlayers.length" :players="filteredPlayers" aria-labelledby="players-heading"></PlayerList>
 			<div v-else-if="searchQuery" class="section__skeleton">{{ messageSkeletonPlayersSearch }}</div>
 			<div v-else class="section__skeleton">{{ messageSkeletonPlayers }}</div>
 		</template>
@@ -31,18 +28,16 @@
 </template>
 
 <script lang="ts">
-import PlayerListItem from "./PlayerListItem.vue";
 import {computed, defineComponent} from "@vue/runtime-core";
 import {useStore} from "@/store";
-import RadioList from "@/components/util/RadioList.vue";
 import {ref} from "vue";
 import SidebarSection from "@/components/sidebar/SidebarSection.vue";
+import PlayerList from "@/components/list/PlayerList.vue";
 
 export default defineComponent({
 	components: {
+		PlayerList,
 		SidebarSection,
-		RadioList,
-		PlayerListItem
 	},
 
 	setup() {
diff --git a/src/components/sidebar/ServerList.vue b/src/components/sidebar/ServersSection.vue
similarity index 77%
rename from src/components/sidebar/ServerList.vue
rename to src/components/sidebar/ServersSection.vue
index 85a8671..7ba3838 100644
--- a/src/components/sidebar/ServerList.vue
+++ b/src/components/sidebar/ServersSection.vue
@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2021 James Lyne
+  - Copyright 2022 James Lyne
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -18,26 +18,22 @@
 	<SidebarSection v-if="servers.size > 1" name="servers">
 		<template v-slot:heading>{{ heading }}</template>
 		<template v-slot:default>
-			<RadioList aria-labelledby="servers-heading">
-				<ServerListItem :server="server" v-for="[name, server] in servers" :key="name"></ServerListItem>
-			</RadioList>
+			<ServerList :servers="servers" aria-labelledby="servers-heading"></ServerList>
 		</template>
 	</SidebarSection>
 </template>
 
 <script lang="ts">
-import ServerListItem from './ServerListItem.vue';
 import {computed, defineComponent} from 'vue';
 import {useStore} from "@/store";
 import SidebarSection from "@/components/sidebar/SidebarSection.vue";
-import RadioList from "@/components/util/RadioList.vue";
+import ServerList from "@/components/list/ServerList.vue";
 
 export default defineComponent({
-	name: 'ServerList',
+	name: 'ServersSection',
 	components: {
-		RadioList,
+		ServerList,
 		SidebarSection,
-		ServerListItem
 	},
 
 	setup() {
diff --git a/src/components/sidebar/SidebarSection.vue b/src/components/sidebar/SidebarSection.vue
index afa1506..e3976ce 100644
--- a/src/components/sidebar/SidebarSection.vue
+++ b/src/components/sidebar/SidebarSection.vue
@@ -27,7 +27,7 @@
 				<span>
 					<slot name="heading"></slot>
 				</span>
-				<SvgIcon name="arrow"></SvgIcon>
+				<SvgIcon v-if="collapsible" name="arrow"></SvgIcon>
 			</button>
 		</h2>
 		<div :id="`${name}-content`" class="section__content" :aria-hidden="collapsed">
diff --git a/src/components/sidebar/WorldList.vue b/src/components/sidebar/WorldsSection.vue
similarity index 79%
rename from src/components/sidebar/WorldList.vue
rename to src/components/sidebar/WorldsSection.vue
index cda8a63..9d41a83 100644
--- a/src/components/sidebar/WorldList.vue
+++ b/src/components/sidebar/WorldsSection.vue
@@ -1,5 +1,5 @@
 <!--
-  - Copyright 2021 James Lyne
+  - Copyright 2022 James Lyne
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -18,27 +18,23 @@
 	<SidebarSection name="maps">
 		<template v-slot:heading>{{ heading }}</template>
 		<template v-slot:default>
-			<RadioList v-if="worlds.size" aria-labelledby="maps-heading">
-				<WorldListItem :world="world" v-for="[name, world] in worlds" :key="`${prefix}_${currentServer}_${name}`"></WorldListItem>
-			</RadioList>
+			<WorldList v-if="worlds.size" :worlds="worlds" :prefix="prefix" aria-labelledby="maps-heading"></WorldList>
 			<div v-else class="section__skeleton">{{ skeleton }}</div>
 		</template>
 	</SidebarSection>
 </template>
 
 <script lang="ts">
-import WorldListItem from './WorldListItem.vue';
 import {computed, defineComponent} from 'vue';
 import {useStore} from "@/store";
-import RadioList from "@/components/util/RadioList.vue";
 import SidebarSection from "@/components/sidebar/SidebarSection.vue";
+import WorldList from "@/components/list/WorldList.vue";
 
 export default defineComponent({
-	name: 'WorldList',
+	name: 'WorldsSection',
 	components: {
+		WorldList,
 		SidebarSection,
-		RadioList,
-		WorldListItem
 	},
 
 	props: {