diff --git a/app.vue b/app.vue
index c105499..8f0571f 100644
--- a/app.vue
+++ b/app.vue
@@ -23,14 +23,11 @@ onMounted(() => {
 		contextMenuHandler(e);
 	});
 	document.addEventListener("mousedown", (e) => {
-		if (e.target instanceof HTMLElement && e.target.classList.contains("context-menu-item")) return;
+		if (e.target instanceof HTMLElement && e.target.closest("#context-menu")) return;
 		console.log("click");
 		console.log("target:", e.target);
 		console.log(e.target instanceof HTMLDivElement);
-		if (contextMenu.value.show) {
-			console.log("context menu is shown, hiding");
-			removeContextMenu(contextMenu);
-		}
+		removeContextMenu(contextMenu);
 		if (e.target instanceof HTMLElement && e.target.classList.contains("message-text") && e.target.contentEditable) {
 			e.target.contentEditable = "false";
 		}
diff --git a/components/Guild/MemberEntry.vue b/components/Guild/MemberEntry.vue
index a5f66fb..baf0e67 100644
--- a/components/Guild/MemberEntry.vue
+++ b/components/Guild/MemberEntry.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="member-item" @click.prevent="showModalPopup" tabindex="0" @contextmenu="showContextMenu($event, contextMenu, menuItems)">
+    <div class="member-item" @click.prevent="showModalPopup" tabindex="0">
         <Avatar :profile="props.member" class="member-avatar"/>
         <span class="member-display-name" :style="`color: ${generateIrcColor(props.member.user.uuid)}`">
             {{ getDisplayName(props.member) }}
@@ -11,18 +11,14 @@
 
 <script lang="ts" setup>
 import { ModalProfilePopup } from '#components';
-import type { ContextMenuInterface, GuildMemberResponse } from '~/types/interfaces';
+import type { GuildMemberResponse } from '~/types/interfaces';
 
 const { getDisplayName } = useProfile()
 
-const contextMenu = useState<ContextMenuInterface>("contextMenu", () => ({ show: false, pointerX: 0, pointerY: 0, items: [] }));
-
 const props = defineProps<{
     member: GuildMemberResponse
 }>();
 
-const menuItems = await createMemberContextMenuItems(props.member, props.member.guild_uuid);
-
 const modalPopupVisible = ref<boolean>(false);
 
 function showModalPopup() {
@@ -35,7 +31,6 @@ function hideModalPopup() {
 </script>
 
 <style>
-
 .member-item {
     position: relative;
 }
@@ -46,9 +41,4 @@ function hideModalPopup() {
 	min-width: 2.3em;
 	max-width: 2.3em;
 }
-
-.member-display-name {
-	cursor: pointer;
-}
-
 </style>
diff --git a/components/Message.vue b/components/Message.vue
index bfb6af6..c926616 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, messageMenuItems)" :id="props.last ? 'last-message' : undefined"
+	<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)" :id="props.last ? 'last-message' : undefined"
 			class="message normal-message" :class="{ 'mentioned': (props.replyMessage || props.isMentioned) && props.message.member.user.uuid != props.me.uuid && props.replyMessage?.member.user.uuid == props.me.uuid }" :data-message-id="props.messageId"
 			:editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div v-if="props.replyMessage" class="message-reply-svg">
@@ -33,7 +33,7 @@
 		</div>
 		<div class="message-data">
 			<div class="message-metadata">
-				<span class="message-author-username" tabindex="0" :style="`color: ${props.authorColor}`" @contextmenu="showContextMenu($event, contextMenu, memberMenuItems)">
+				<span class="message-author-username" tabindex="0" :style="`color: ${props.authorColor}`">
 					{{ getDisplayName(props.author) }}
 				</span>
 				<span class="message-date" :title="date.toString()">
@@ -47,7 +47,7 @@
 		</div>
 		<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
 	</div>
-	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, messageMenuItems)" :id="props.last ? 'last-message' : undefined"
+	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)" :id="props.last ? 'last-message' : undefined"
 			class="message grouped-message" :class="{ 'message-margin-bottom': props.marginBottom, 'mentioned': props.replyMessage || props.isMentioned }"
 			:data-message-id="props.messageId" :editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div class="left-column">
@@ -72,8 +72,6 @@ import type { ContextMenuInterface, ContextMenuItem } from '~/types/interfaces';
 
 const { getDisplayName } = useProfile()
 
-const route = useRoute();
-
 const props = defineProps<MessageProps>();
 
 const contextMenu = useState<ContextMenuInterface>("contextMenu", () => ({ show: false, pointerX: 0, pointerY: 0, items: [] }));
@@ -146,23 +144,21 @@ console.log("media links:", mediaLinks);
 //	showHover.value = !showHover.value;
 //}
 
-const messageMenuItems: ContextMenuItem[] = [
+const menuItems: ContextMenuItem[] = [
 	{ name: "Reply", icon: "lucide:reply", type: "normal", callback: () => { if (messageElement.value) replyToMessage(messageElement.value, props) } }
 ]
 
 console.log("me:", props.me);
-if (props.author.user.uuid == props.me.uuid) {
+if (props.author?.user.uuid == props.me.uuid) {
 	// Inserts "edit" option at index 1 (below the "reply" option)
-	messageMenuItems.splice(Math.min(1, messageMenuItems.length), 0, { name: "Edit (WIP)", icon: "lucide:square-pen", type: "normal", callback: () => { /* if (messageElement.value) editMessage(messageElement.value, props) */ } });
+	menuItems.splice(1, 0, { name: "Edit (WIP)", icon: "lucide:square-pen", type: "normal", callback: () => { /* if (messageElement.value) editMessage(messageElement.value, props) */ } });
 }
 
-if (props.author.user.uuid == props.me.uuid /* || check message delete permission*/) {
+if (props.author?.user.uuid == props.me.uuid /* || check message delete permission*/) {
 	// Inserts "edit" option at index 2 (below the "edit" option)
-	messageMenuItems.splice(Math.min(2, messageMenuItems.length), 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
+	menuItems.splice(2, 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
 }
 
-const memberMenuItems = await createMemberContextMenuItems(props.author, route.params.serverId as string);
-
 function getDayDifference(date1: Date, date2: Date) {
     const midnight1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
     const midnight2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
@@ -238,10 +234,6 @@ function getDayDifference(date1: Date, date2: Date) {
 	max-width: 2em;
 }
 
-.message-author-username {
-	cursor: pointer;
-}
-
 .left-column {
 	min-width: 2rem;
 	display: flex;
diff --git a/components/UserInterface/ContextMenu.vue b/components/UserInterface/ContextMenu.vue
index 5d3a4be..1767657 100644
--- a/components/UserInterface/ContextMenu.vue
+++ b/components/UserInterface/ContextMenu.vue
@@ -18,10 +18,6 @@ onMounted(() => {
 	if (contextMenu) {
 		contextMenu.style.left = props.pointerX.toString() + "px";
 		contextMenu.style.top = props.pointerY.toString() + "px";
-		const rect = contextMenu.getBoundingClientRect();
-		if (rect.right > (window.innerWidth || document.documentElement.clientWidth)) {
-			contextMenu.style.left = (props.pointerX - contextMenu.clientWidth).toString() + "px";
-		}
 	}
 });
 
diff --git a/composables/api.ts b/composables/api.ts
index f4004f5..c949bc0 100644
--- a/composables/api.ts
+++ b/composables/api.ts
@@ -25,17 +25,6 @@ export const useApi = () => {
 		return await fetchWithApi("/me")
 	}
 
-	async function fetchMeMember(guildId: string): Promise<GuildMemberResponse | undefined> {
-		const { getUser } = useAuth();
-
-		const me = await getUser();
-		if (me) {
-			const members = await fetchMembers(guildId);
-			const meMember = members.objects.find(member => member.user.uuid == me.uuid);
-			return meMember;
-		}
-	}
-
 	async function fetchChannels(guildId: string): Promise<ChannelResponse[]> {
 		return ensureIsArray(await fetchWithApi(`/guilds/${guildId}/channels`));
 	}
@@ -58,14 +47,6 @@ export const useApi = () => {
 	async function fetchMember(guildId: string, memberId: string): Promise<GuildMemberResponse | undefined> {
 		return await fetchWithApi(`/guilds/${guildId}/members/${memberId}`);
 	}
-
-	async function kickMember(memberId: string) {
-		return await fetchWithApi(`/members/${memberId}`, { method: "DELETE" });
-	}
-
-	async function banMember(guildId: string, memberId: string) {
-		//
-	}
 	
 	async function fetchUsers() {
 		return await fetchWithApi(`/users`);
@@ -133,13 +114,10 @@ export const useApi = () => {
 		fetchGuild,
 		fetchMyGuilds,
 		fetchMe,
-		fetchMeMember,
 		fetchChannels,
 		fetchChannel,
 		fetchMembers,
 		fetchMember,
-		kickMember,
-		banMember,
 		fetchUsers,
 		fetchUser,
 		fetchFriends,
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index 54f5a2c..f07dabd 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -56,7 +56,7 @@ const showGuildSettings = ref(false);
 //const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[];
 //console.log("channelid: servers:", servers);
 
-const { fetchMembers, fetchMeMember } = useApi();
+const { fetchMembers } = useApi();
 
 onMounted(async () => {
 	console.log("mounting");
@@ -84,14 +84,6 @@ async function setArrayVariables() {
 	console.log("channels:", channels.value);
 	channel.value = await fetchWithApi(`/channels/${route.params.channelId}`);
 	console.log("channel:", channel.value);
-	const meMember = useState<GuildMemberResponse | undefined>("meMember");
-	console.log("[CHANNEL] meMember:", meMember.value);
-	if (!meMember.value) {
-		console.log("[CHANNEL] meMember is uninitialized, initializing");
-		const fetchedMeMember = await fetchMeMember(route.params.serverId as string);
-		meMember.value = fetchedMeMember;
-		console.log("[CHANNEL] meMember set to:", fetchedMeMember);
-	}
 }
 
 function toggleGuildSettings(e: Event) {
diff --git a/utils/showContextMenu.ts b/utils/showContextMenu.ts
index 92a8b82..fdf5243 100644
--- a/utils/showContextMenu.ts
+++ b/utils/showContextMenu.ts
@@ -3,15 +3,10 @@ import ContextMenu from "~/components/UserInterface/ContextMenu.vue";
 import type { ContextMenuInterface, ContextMenuItem } from "~/types/interfaces";
 
 export default (e: MouseEvent | PointerEvent, contextMenu: ContextMenuInterface, menuItems: ContextMenuItem[]) => {
-  e.preventDefault();
-  e.stopPropagation();
-  console.log("Menu items:", menuItems);
-  if (menuItems.length) {
-    console.log("Showing context menu");
-    contextMenu.show = true;
-    contextMenu.pointerX = e.clientX;
-	contextMenu.pointerY = e.clientY;
-    contextMenu.items = menuItems;
-    console.log("Showed");
-  }
+  console.log("Showing context menu");
+  contextMenu.show = true;
+  contextMenu.pointerX = e.clientX;
+  contextMenu.pointerY = e.clientY;
+  contextMenu.items = menuItems;
+  console.log("Showed");
 }