diff --git a/shatter-mobile/app/(tabs)/ProfilePage.tsx b/shatter-mobile/app/(tabs)/ProfilePage.tsx
index 3397963..731a643 100644
--- a/shatter-mobile/app/(tabs)/ProfilePage.tsx
+++ b/shatter-mobile/app/(tabs)/ProfilePage.tsx
@@ -13,6 +13,7 @@ import { SvgUri } from "react-native-svg";
 import { useAuth } from "../../src/components/context/AuthContext";
 import AnimatedTab from "../../src/components/general/AnimatedTab";
 import { ProfilePageStyling as styles } from "../../src/styling/ProfilePage.styles";
+import { LinkRow } from "@/src/components/general/LinkRow";
 
 export default function Profile() {
 	const { user, logout } = useAuth();
@@ -70,30 +71,23 @@ export default function Profile() {
 									</Text>
 								)}
 
-								{/* LinkedIn */}
-								{social?.linkedin && (
-									<View style={styles.linkContainer}>
-										<Text style={styles.linkLabel}>LinkedIn</Text>
-										<Text style={styles.linkUrl}>{social.linkedin}</Text>
-									</View>
-								)}
-
-								{/* GitHub */}
-								{social?.github && (
-									<View style={styles.linkContainer}>
-										<Text style={styles.linkLabel}>GitHub</Text>
-										<Text style={styles.linkUrl}>{social.github}</Text>
+								{/* Social Links */}
+								{user.socialLinks && (
+									<View>
+										{social?.linkedin && (
+											<LinkRow label="LinkedIn" url={social.linkedin} />
+										)}
+			
+										{social?.github && (
+											<LinkRow label="GitHub" url={social.github} />
+										)}
+			
+										{social?.other?.map((link, index) => (
+											<LinkRow key={index} label={link.label} url={link.url} />
+										))}
 									</View>
 								)}
 
-								{/* Other Links */}
-								{social?.other?.map((link, index) => (
-									<View key={index} style={styles.linkContainer}>
-										<Text style={styles.linkLabel}>{link.label}</Text>
-										<Text style={styles.linkUrl}>{link.url}</Text>
-									</View>
-								))}
-
 								<TouchableOpacity
 									style={styles.editButton}
 									onPress={() => router.push("/UserPages/UpdateProfile")}
diff --git a/shatter-mobile/src/components/games/IcebreakerGame.tsx b/shatter-mobile/src/components/games/IcebreakerGame.tsx
index c320a5b..19d0d5b 100644
--- a/shatter-mobile/src/components/games/IcebreakerGame.tsx
+++ b/shatter-mobile/src/components/games/IcebreakerGame.tsx
@@ -10,8 +10,6 @@ import { useAuth } from "../context/AuthContext";
 import { useGame } from "../context/GameContext";
 import NameBingo from "./NameBingo";
 
-const POLL_INTERVAL = 4000; //4 seconds
-
 type IcebreakerGameProps = {
 	event: EventIB;
 };
diff --git a/shatter-mobile/src/components/games/NameBingo.tsx b/shatter-mobile/src/components/games/NameBingo.tsx
index 3793f77..2099946 100644
--- a/shatter-mobile/src/components/games/NameBingo.tsx
+++ b/shatter-mobile/src/components/games/NameBingo.tsx
@@ -1,19 +1,16 @@
 import { useGame } from "@/src/components/context/GameContext";
 import { EventState, Participant } from "@/src/interfaces/Event";
 import { BingoTile } from "@/src/interfaces/Game";
-import {
-    getBingoCategories,
-    getParticipantsByEventId,
-} from "@/src/services/game.service";
+import { getBingoCategories } from "@/src/services/game.service";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useEffect, useState } from "react";
 import {
-    DimensionValue,
-    ScrollView,
-    Text,
-    TextInput,
-    TouchableOpacity,
-    View,
+	DimensionValue,
+	ScrollView,
+	Text,
+	TextInput,
+	TouchableOpacity,
+	View,
 } from "react-native";
 import { NameBingoStyling as styles } from "../../styling/NameBingo.styles";
 import FullPageLoader from "../general/FullPageLoader";
@@ -267,34 +264,37 @@ const NameBingo = ({ eventId, onConnect }: NameBingoProps) => {
 			)}
 
 			{/* Hint */}
-			{!selectedCardId && gameState.progress !== EventState.COMPLETED && (
-				<Text style={styles.selectCardHint}>Select a square first</Text>
-			)}
+			{!selectedCardId &&
+				gameState.progress !== EventState.COMPLETED &&
+				!gameState.viewingGame && (
+					<Text style={styles.selectCardHint}>Select a square first</Text>
+				)}
 
 			{/* Search */}
-			{gameState.progress !== EventState.COMPLETED && (
-				<View style={styles.searchContainer}>
-					<TextInput
-						style={styles.inputFlex}
-						placeholder="Who did you find?"
-						value={search}
-						onChangeText={setSearch}
-					/>
-					{search.length > 0 && filteredParticipants.length > 0 && (
-						<ScrollView style={styles.dropdown}>
-							{filteredParticipants.map((p) => (
-								<TouchableOpacity
-									key={p._id}
-									style={styles.dropdownItem}
-									onPress={() => handleAssign(p)}
-								>
-									<Text>{p.name}</Text>
-								</TouchableOpacity>
-							))}
-						</ScrollView>
-					)}
-				</View>
-			)}
+			{gameState.progress !== EventState.COMPLETED &&
+				!gameState.viewingGame && (
+					<View style={styles.searchContainer}>
+						<TextInput
+							style={styles.inputFlex}
+							placeholder="Who did you find?"
+							value={search}
+							onChangeText={setSearch}
+						/>
+						{search.length > 0 && filteredParticipants.length > 0 && (
+							<ScrollView style={styles.dropdown}>
+								{filteredParticipants.map((p) => (
+									<TouchableOpacity
+										key={p._id}
+										style={styles.dropdownItem}
+										onPress={() => handleAssign(p)}
+									>
+										<Text>{p.name}</Text>
+									</TouchableOpacity>
+								))}
+							</ScrollView>
+						)}
+					</View>
+				)}
 
 			{/* Card Grid */}
 			<View style={{ padding: 12 }}>