diff --git a/trackscape-discord-shared/src/database/clan_mates.rs b/trackscape-discord-shared/src/database/clan_mates.rs
index 2bd741b..d9830ec 100644
--- a/trackscape-discord-shared/src/database/clan_mates.rs
+++ b/trackscape-discord-shared/src/database/clan_mates.rs
@@ -1,3 +1,4 @@
+use super::pb_records_db::PersonalBestRecordsModel;
 use crate::database::clan_mate_collection_log_totals::ClanMateCollectionLogTotalModel;
 use crate::database::ClanMatesDb;
 use anyhow::Error;
@@ -198,6 +199,7 @@ impl ClanMates for ClanMatesDb {
     async fn remove_clan_mate(&self, guild_id: u64, player_name: String) -> Result<(), Error> {
         //TODO add a bit to clean up other collections too
 
+        //TODO dont forget to remove PBs
         let collection = self
             .db
             .collection::<ClanMateModel>(ClanMateModel::COLLECTION_NAME);
@@ -212,25 +214,36 @@ impl ClanMates for ClanMatesDb {
         let player = possible_player.unwrap();
 
         //Removes other data from db may move else where
-        let collection_log_collection = self
-            .db
-            .collection::<ClanMateCollectionLogTotalModel>(ClanMateCollectionLogTotalModel::COLLECTION_NAME);
-
-        let filter = doc! {
+        let delete_filter = doc! {
             "guild_id": bson::to_bson(&guild_id).unwrap(),
             "player_id": player.id.clone(),
         };
-        let collection_log_result = collection_log_collection.delete_many(filter, None).await;
+
+        let collection_log_collection = self.db.collection::<ClanMateCollectionLogTotalModel>(
+            ClanMateCollectionLogTotalModel::COLLECTION_NAME,
+        );
+
+        let collection_log_result = collection_log_collection
+            .delete_many(delete_filter.clone(), None)
+            .await;
         if collection_log_result.is_err() {
             println!(
                 "Failed to remove collection log totals for clan mate: {}",
                 player_name
             );
             println!("Error: {:?}", collection_log_result.err());
-            return Err(anyhow::anyhow!(format!(
-                "Failed to remove collection log totals for clan mate: {}",
+        }
+
+        let pb_collection = self
+            .db
+            .collection::<PersonalBestRecordsModel>(PersonalBestRecordsModel::COLLECTION_NAME);
+        let pb_records_result = pb_collection.delete_many(delete_filter, None).await;
+        if pb_records_result.is_err() {
+            println!(
+                "Failed to remove personal best records for clan mate: {}",
                 player_name
-            )));
+            );
+            println!("Error: {:?}", pb_records_result.err());
         }
         //End of removing from other collections
 
diff --git a/trackscape-discord-ui/src/components/General/DataTable.vue b/trackscape-discord-ui/src/components/General/DataTable.vue
index 0783361..604368e 100644
--- a/trackscape-discord-ui/src/components/General/DataTable.vue
+++ b/trackscape-discord-ui/src/components/General/DataTable.vue
@@ -30,6 +30,11 @@
       type: String,
       required: false,
       default: ""
+    },
+    noResultsMessage: {
+      type: String,
+      required: false,
+      default: "No results found"
     }
   });
 
@@ -94,7 +99,7 @@
       <tbody>
         <tr v-if="filteredData.length === 0"
             class="text-center min-w-full">
-          <td><p>No results found</p></td>
+          <td :colspan="props.columns?.length">{{ props.noResultsMessage }}</td>
         </tr>
 
         <tr v-for="(item, index) in filteredData"
diff --git a/trackscape-discord-ui/src/stores/PbStore.ts b/trackscape-discord-ui/src/stores/PbStore.ts
index 27f7cf3..967fd3b 100644
--- a/trackscape-discord-ui/src/stores/PbStore.ts
+++ b/trackscape-discord-ui/src/stores/PbStore.ts
@@ -11,6 +11,7 @@ export const usePbStore = defineStore('pb', {
       selectedActivityName: '',
       clanId: '',
       records: [] as PbRecord[],
+      loading: false
     };
   },
   actions: {
@@ -23,10 +24,12 @@ export const usePbStore = defineStore('pb', {
 
         });
         this.records = records;
+        this.loading = false;
         router.replace({ name: 'personal-best', params: { clanId: this.clanId, activityId: this.selectedActivity } });
       });
     },
     async setSelectedActivity(activity: PbActivity, guildId: string) {
+      this.loading = true;
       this.selectedActivity = activity._id;
       this.selectedActivityName = activity.activity_name;
       this.clanId = guildId;
diff --git a/trackscape-discord-ui/src/views/clans/clan/subviews/LeaderboardView.vue b/trackscape-discord-ui/src/views/clans/clan/subviews/LeaderboardView.vue
index c486d69..ada3f04 100644
--- a/trackscape-discord-ui/src/views/clans/clan/subviews/LeaderboardView.vue
+++ b/trackscape-discord-ui/src/views/clans/clan/subviews/LeaderboardView.vue
@@ -39,6 +39,24 @@ const leaderBoardMenus = [
 ];
 </script>
 <template>
+  <div v-if="route.name === 'personal-best'"
+       role="alert"
+       class="alert shadow-lg alert-info">
+    <svg xmlns="http://www.w3.org/2000/svg"
+         fill="none"
+         viewBox="0 0 24 24"
+         class="stroke-current shrink-0 w-6 h-6"><path stroke-linecap="round"
+                                                       stroke-linejoin="round"
+                                                       stroke-width="2"
+                                                       d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+    <div>
+      <h3 class="text-sm text-bold">Personal Best Leaderboards are still a work in progress.</h3>
+      <a class="underline text-sm"
+         href="https://github.com/fatfingers23/trackscape-discord-bot/issues/29">View or add bugs for PBs</a>
+
+    </div>
+
+  </div>
   <div class="pt-1 justify-between items-center flex md:flex-row flex-col">
     <div
       role="tablist"
@@ -53,6 +71,7 @@ const leaderBoardMenus = [
     <PersonalBestActivitySelect v-if="route.name === 'personal-best' && clanId"
                                 :clan-id="clanId"/>
   </div>
+
   <div class="container bg-base-200">
 
     <router-view v-slot="{ Component}" >
diff --git a/trackscape-discord-ui/src/views/clans/clan/subviews/leaderboards/PersonalBestLeaderboardView.vue b/trackscape-discord-ui/src/views/clans/clan/subviews/leaderboards/PersonalBestLeaderboardView.vue
index b1215e1..fb0f02f 100644
--- a/trackscape-discord-ui/src/views/clans/clan/subviews/leaderboards/PersonalBestLeaderboardView.vue
+++ b/trackscape-discord-ui/src/views/clans/clan/subviews/leaderboards/PersonalBestLeaderboardView.vue
@@ -55,14 +55,13 @@ const osrsTimeDisplay = (timeInSeconds: number) => {
     <div class="">
       <TransitionGroup name="slide-fade">
 
-        <SkeletonTable v-if="store.records.length === 0"
+        <SkeletonTable v-if="store.loading"
                        :search-field="true"
                        :columns="3"/>
 
-
         <DataTable
           v-else
-          
+          no-results-message="No personal bests found for this activity in your clan, can record yours with the RuneLite !pb command."
           :columns="columns"
           :data="store.getRecords"
           search-field="clan_mate.player_name"