diff --git a/.github/workflows/bats-test.yml b/.github/workflows/bats-test.yml
new file mode 100644
index 0000000000..49e26b6e6b
--- /dev/null
+++ b/.github/workflows/bats-test.yml
@@ -0,0 +1,55 @@
+name: Run BATS Tests
+
+on:
+  push:
+    paths:
+      - 'docker-compose/setup-script/noco.sh'
+  workflow_dispatch:
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install jq
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y jq
+
+      - name: Prepare matrix for test files
+        id: set-matrix
+        run: |
+          BATS_FILES=$(find docker-compose/setup-script/tests -name '*.bats')
+          MATRIX_JSON=$(echo $BATS_FILES | jq -Rsc 'split("\n") | map(select(. != ""))')
+          echo "matrix=$MATRIX_JSON" >> $GITHUB_ENV
+
+  test:
+    needs: prepare
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test: ${{fromJson(env.matrix)}}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install BATS
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y bats expect
+
+      - name: Get working directory
+        run: |
+          WORKING_DIR="$(pwd)/docker-compose/setup-script/tests"
+          echo "WORKING_DIR=$WORKING_DIR" >> $GITHUB_ENV
+
+      - name: Run BATS test
+        run: bats ${{ matrix.test }}
+        env:
+          WORKING_DIR: ${{ env.WORKING_DIR }}
+          SKIP_TARE_DOWN: true
diff --git a/docker-compose/setup-script/noco.sh b/docker-compose/setup-script/noco.sh
index 4b6e7abc80..2c5c809d10 100755
--- a/docker-compose/setup-script/noco.sh
+++ b/docker-compose/setup-script/noco.sh
@@ -1,6 +1,24 @@
 #!/bin/bash
 # set -x
 
+# ******************************************************************************
+# *****************    GLOBAL VARIABLES START  *********************************
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+MAGENTA='\033[0;35m'
+CYAN='\033[0;36m'
+ORANGE='\033[0;33m'
+BOLD='\033[1m'
+NC='\033[0m'
+
+NOCO_HOME="${HOME}/.nocodb"
+
+# *****************    GLOBAL VARIABLES END  ***********************************
+# ******************************************************************************
+
 # ******************************************************************************
 # *****************    HELPER FUNCTIONS START  *********************************
 
@@ -100,9 +118,251 @@ read_number_range() {
     echo "$number"
 }
 
+check_if_docker_is_running() {
+    if ! $DOCKER_COMMAND ps >/dev/null 2>&1; then
+        echo    "+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+"
+        echo -e "| ${BOLD}${YELLOW}Warning !          ${NC}                                                       |"
+        echo    "| Docker is not running. Most of the commands will not work without Docker. |"
+        echo    "| Use the following command to start Docker:                                |"
+        echo -e "| ${BLUE}     sudo systemctl start docker        ${NC}                                  |"
+        echo    "+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+"
+    fi
+}
+
 # *****************    HELPER FUNCTIONS END  ***********************************
 # ******************************************************************************
 
+# *****************************************************************************
+# *************************** Management  *************************************
+
+# Function to display the menu
+show_menu() {
+    clear
+    check_if_docker_is_running
+    echo ""
+    echo "$MSG"
+    echo -e "\t\t${BOLD}Service Management Menu${NC}"
+    echo -e " ${GREEN}1. Start Service"
+    echo -e " ${ORANGE}2. Stop Service"
+    echo -e " ${CYAN}3. Logs"
+    echo -e " ${MAGENTA}4. Restart"
+    echo -e " ${BLUE}5. Upgrade"
+    echo -e " 6. Scale"
+    echo -e " 7. Monitoring"
+    echo -e " ${RED}0. Exit${NC}"
+}
+
+# Function to start the service
+start_service() {
+    echo -e "\nStarting nocodb..."
+    $DOCKER_COMMAND compose up -d
+}
+
+# Function to stop the service
+stop_service() {
+    echo -e "\nStopping nocodb..."
+    $DOCKER_COMMAND compose stop
+}
+
+show_logs_sub_menu() {
+    clear
+    echo "Select a replica for $1:"
+    for i in $(seq 1 $2); do
+        echo "$i. \"$1\" replica $i"
+    done
+    echo "A. All"
+    echo "0. Back to Logs Menu"
+    echo "Enter replica number: "
+    read -r replica_choice
+
+    if [[ "$replica_choice" =~ ^[0-9]+$ ]] && [ "$replica_choice" -gt 0 ] && [ "$replica_choice" -le "$2" ]; then
+        container_id=$($DOCKER_COMMAND compose ps | grep "$1-$replica_choice" | cut -d " " -f 1)
+        $DOCKER_COMMAND logs -f "$container_id"
+    elif [ "$replica_choice" == "A" ] || [ "$replica_choice" == "a" ]; then
+        $DOCKER_COMMAND compose logs -f "$1"
+    elif [ "$replica_choice" == "0" ]; then
+        show_logs
+    else
+        show_logs_sub_menu "$1" "$2"
+    fi
+}
+
+
+# Function to show logs
+show_logs() {
+    clear
+    echo "Select a container for logs:"
+
+    # Fetch the list of services
+    services=()
+    while IFS= read -r service; do
+        services+=("$service")
+    done < <($DOCKER_COMMAND compose ps --services)
+
+    service_replicas=()
+    count=0
+
+    # For each service, count the number of running instances
+    for service in "${services[@]}"; do
+        # Count the number of lines that have the service name, which corresponds to the number of replicas
+        replicas=$($DOCKER_COMMAND compose ps "$service" | grep -c "$service")
+        service_replicas["$count"]=$replicas
+        count=$((count + 1))
+    done
+
+    count=1
+
+    for service in "${services[@]}"; do
+        echo "$count. $service (${service_replicas[(($count - 1))]} replicas)"
+        count=$((count + 1))
+    done
+
+    echo "A. All"
+    echo "0. Back to main menu"
+    echo "Enter your choice: "
+    read -r log_choice
+    echo
+
+    if [[ "$log_choice" =~ ^[0-9]+$ ]] && [ "$log_choice" -gt 0 ] && [ "$log_choice" -lt "$count" ]; then
+        service_index=$((log_choice-1))
+        service="${services[$service_index]}"
+        num_replicas="${service_replicas[$service_index]}"
+
+        if [ "$num_replicas" -gt 1 ]; then
+            trap 'show_logs_sub_menu "$service" "$num_replicas"' INT
+            show_logs_sub_menu "$service" "$num_replicas"
+            trap - INT
+        else
+            trap 'show_logs' INT
+            $DOCKER_COMMAND compose logs -f "$service"
+        fi
+    elif [ "$log_choice" == "A" ] || [ "$log_choice" == "a" ]; then
+        trap 'show_logs' INT
+        $DOCKER_COMMAND compose logs -f
+    elif [ "$log_choice" == "0" ]; then
+        return
+    else
+        show_logs
+    fi
+
+    trap - INT
+}
+
+# Function to restart the service
+restart_service() {
+    echo -e "\nRestarting nocodb..."
+    $DOCKER_COMMAND compose restart
+}
+
+# Function to upgrade the service
+upgrade_service() {
+    echo -e "\nUpgrading nocodb..."
+    $DOCKER_COMMAND compose pull
+    $DOCKER_COMMAND compose up -d --force-recreate
+    $DOCKER_COMMAND image prune -a -f
+}
+
+# Function to scale the service
+scale_service() {
+    num_cores=$(nproc || sysctl -n hw.ncpu || echo 1)
+    current_scale=$($DOCKER_COMMAND compose ps -q nocodb | wc -l)
+    echo -e "\nCurrent number of instances: $current_scale"
+    echo "How many instances of NocoDB do you want to run (Maximum: ${num_cores}) ? (default: 1): "
+    scale_num=$(read_number_range 1 "$num_cores")
+
+    if [ "$scale_num" -eq "$current_scale" ]; then
+        echo "Number of instances is already set to $scale_num. Returning to main menu."
+        return
+    fi
+
+    $DOCKER_COMMAND compose up -d --scale nocodb="$scale_num"
+}
+
+# Function for basic monitoring
+monitoring_service() {
+    echo -e '\nLoading stats...'
+    trap ' ' INT
+    $DOCKER_COMMAND stats
+}
+
+management_menu() {
+  # Main program loop
+  while true; do
+      trap - INT
+      show_menu
+      echo "Enter your choice: "
+
+      read -r choice
+      case $choice in
+          1) start_service && MSG="NocoDB Started" ;;
+          2) stop_service && MSG="NocoDB Stopped" ;;
+          3) show_logs ;;
+          4) restart_service && MSG="NocoDB Restarted" ;;
+          5) upgrade_service && MSG="NocoDB has been upgraded to latest version" ;;
+          6) scale_service && MSG="NocoDB has been scaled" ;;
+          7) monitoring_service ;;
+          0) exit 0 ;;
+          *) MSG="\nInvalid choice. Please select a correct option." ;;
+      esac
+  done
+}
+
+# ******************************************************************************
+# *************************** Management END  **********************************
+
+
+# ******************************************************************************
+# *****************  Existing Install Test  ************************************
+
+IS_DOCKER_REQUIRE_SUDO=$(check_for_docker_sudo)
+DOCKER_COMMAND=$([ "$IS_DOCKER_REQUIRE_SUDO" = "y" ] && echo "sudo docker" || echo "docker")
+
+NOCO_FOUND=false
+
+# Check if $NOCO_HOME exists as directory
+if [ -d "$NOCO_HOME" ]; then
+  NOCO_FOUND=true
+elif $DOCKER_COMMAND ps --format '{{.Names}}' | grep -q "nocodb"; then
+    NOCO_ID=$(docker ps | grep "nocodb/nocodb" | cut -d ' ' -f 1)
+    CUSTOM_HOME=$(docker inspect --format='{{index .Mounts 0}}' "$NOCO_ID" | cut -d ' ' -f 3)
+    PARENT_DIR=$(dirname "$CUSTOM_HOME")
+
+    ln -s "$PARENT_DIR" "$NOCO_HOME"
+    basename "$PARENT_DIR" > "$NOCO_HOME/.COMPOSE_PROJECT_NAME"
+
+    NOCO_FOUND=true
+else
+    mkdir -p "$NOCO_HOME"
+fi
+
+cd "$NOCO_HOME" || exit 1
+
+# Check if nocodb is already installed
+if [ "$NOCO_FOUND" = true ]; then
+    echo "NocoDB is already installed. And running."
+    echo "Do you want to reinstall NocoDB? [Y/N] (default: N): "
+    read -r REINSTALL
+
+    if [ -f "$NOCO_HOME/.COMPOSE_PROJECT_NAME" ]; then
+        COMPOSE_PROJECT_NAME=$(cat "$NOCO_HOME/.COMPOSE_PROJECT_NAME")
+        export COMPOSE_PROJECT_NAME
+    fi
+
+    if [ "$REINSTALL" != "Y" ] && [ "$REINSTALL" != "y" ]; then
+        management_menu
+        exit 0
+    else
+        echo "Reinstalling NocoDB..."
+        $DOCKER_COMMAND compose down
+
+        unset COMPOSE_PROJECT_NAME
+        cd /tmp || exit 1
+        rm -rf "$NOCO_HOME"
+
+        mkdir -p "$NOCO_HOME"
+        cd "$NOCO_HOME" || exit 1
+    fi
+fi
 
 
 # ******************************************************************************
@@ -116,7 +376,7 @@ REQUIRED_PORTS=(80 443)
 
 echo "** Performing nocodb system check and setup. This step may require sudo permissions"
 
-# pre install wget if not found
+# pre-install wget if not found
 if ! command_exists wget; then
   echo "wget is not installed. Setting up for installation..."
   install_package wget
@@ -135,16 +395,11 @@ for tool in docker lsof openssl; do
   fi
 done
 
-# e. Check if NocoDB is already installed and its expected version
-# echo "Checking if NocoDB is already installed and its expected version..."
-# Replace the following command with the actual command to check NocoDB installation and version
-# Example: nocodb_version=$(command_to_get_nocodb_version)
-# echo "NocoDB version: $nocodb_install_version"
 
 # f. Port mapping check
 echo " | Checking port accessibility..."
 for port in "${REQUIRED_PORTS[@]}"; do
-  if lsof -Pi :$port -sTCP:LISTEN -t >/dev/null; then
+  if lsof -Pi :"$port" -sTCP:LISTEN -t >/dev/null; then
     echo " | WARNING: Port $port is in use. Please make sure it is free." >&2
   else
     echo " | Port $port is free."
@@ -165,26 +420,7 @@ if [ -z "$PUBLIC_IP" ]; then
     PUBLIC_IP="localhost"
 fi
 
-# generate a folder for the docker-compose file which is not existing and do the setup within the folder
-# Define the folder name
-FOLDER_NAME="nocodb_$(date +"%Y%m%d_%H%M%S")"
-
-# prompt for custom folder name and if left empty skip
-#echo "Enter a custom folder name or press Enter to use the default folder name ($FOLDER_NAME): "
-#read CUSTOM_FOLDER_NAME
-
-message_arr+=("Setup folder: $FOLDER_NAME")
-
-if [ -n "$CUSTOM_FOLDER_NAME" ]; then
-    FOLDER_NAME="$CUSTOM_FOLDER_NAME"
-fi
-
-
-# Create the folder
-mkdir -p "$FOLDER_NAME"
-
-# Navigate into the folder
-cd "$FOLDER_NAME" || exit
+message_arr+=("Setup folder: $NOCO_HOME")
 
 # ******************** SYSTEM REQUIREMENTS CHECK END  **************************
 # ******************************************************************************
@@ -223,7 +459,7 @@ fi
 
 if [ -n "$EDITION" ] && { [ "$EDITION" = "EE" ] || [ "$EDITION" = "ee" ]; }; then
     echo "Enter the NocoDB license key: "
-    read LICENSE_KEY
+    read -r LICENSE_KEY
     if [ -z "$LICENSE_KEY" ]; then
         echo "License key is required for Enterprise Edition installation"
         exit 1
@@ -535,211 +771,6 @@ server {
 EOF
 fi
 
-IS_DOCKER_REQUIRE_SUDO=$(check_for_docker_sudo)
-DOCKER_COMMAND=$([ "$IS_DOCKER_REQUIRE_SUDO" = "y" ] && echo "sudo docker" || echo "docker")
-
-# Generate help script
-cat > help.sh <<EOF
-#!/bin/bash
-
-$(declare -f read_number)
-
-$(declare -f read_number_range)
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-MAGENTA='\033[0;35m'
-CYAN='\033[0;36m'
-ORANGE='\033[0;33m'
-BOLD='\033[1m'
-NC='\033[0m'
-
-check_if_docker_is_running() {
-    if ! $DOCKER_COMMAND ps >/dev/null 2>&1; then
-        echo    "+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+"
-        echo -e "| \${BOLD}\${YELLOW}Warning !          \${NC}                                                       |"
-        echo    "| Docker is not running. Most of the commands will not work without Docker. |"
-        echo    "| Use the following command to start Docker:                                |"
-        echo -e "| \${BLUE}     sudo systemctl start docker        \${NC}                                  |"
-        echo    "+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+"
-    fi
-}
-
-# Function to display the menu
-show_menu() {
-    clear
-    check_if_docker_is_running
-    echo ""
-    echo \$MSG
-    echo -e "\t\t\${BOLD}Service Management Menu\${NC}"
-    echo -e " \${GREEN}1. Start Service"
-    echo -e " \${ORANGE}2. Stop Service"
-    echo -e " \${CYAN}3. Logs"
-    echo -e " \${MAGENTA}4. Restart"
-    echo -e " \${BLUE}5. Upgrade"
-    echo -e " 6. Scale"
-    echo -e " 7. Monitoring"
-    echo -e " \${RED}0. Exit\${NC}"
-}
-
-# Function to start the service
-start_service() {
-    echo -e "\nStarting nocodb..."
-    $DOCKER_COMMAND compose up -d
-}
-
-# Function to stop the service
-stop_service() {
-    echo -e "\nStopping nocodb..."
-    $DOCKER_COMMAND compose stop
-}
-
-show_logs_sub_menu() {
-    clear
-    echo "Select a replica for \$1:"
-    for i in \$(seq 1 \$2); do
-        echo "\$i. \$1 replica \$i"
-    done
-    echo "A. All"
-    echo "0. Back to Logs Menu"
-    echo "Enter replica number: "
-    read replica_choice
-
-    if [[ "\$replica_choice" =~ ^[0-9]+\$ ]] && [ "\$replica_choice" -gt 0 ] && [ "\$replica_choice" -le "\$2" ]; then
-        container_id=\$($DOCKER_COMMAND compose ps | grep "\$1-\$replica_choice" | cut -d " " -f 1)
-        $DOCKER_COMMAND logs -f "\$container_id"
-    elif [ "\$replica_choice" == "A" ] || [ "\$replica_choice" == "a" ]; then
-        $DOCKER_COMMAND compose logs -f \$1
-    elif [ "\$replica_choice" == "0" ]; then
-        show_logs
-    else
-        show_logs_sub_menu "\$1" "\$2"
-    fi
-}
-
-
-# Function to show logs
-show_logs() {
-    clear
-    echo "Select a container for logs:"
-
-    # Fetch the list of services
-    services=()
-    while IFS= read -r service; do
-        services+=("\$service")
-    done < <($DOCKER_COMMAND compose ps --services)
-
-    service_replicas=()
-    count=0
-
-    # For each service, count the number of running instances
-    for service in "\${services[@]}"; do
-        # Count the number of lines that have the service name, which corresponds to the number of replicas
-        replicas=\$($DOCKER_COMMAND compose ps \$service | grep "\$service" | wc -l)
-        service_replicas["\$count"]=\$replicas
-        count=\$((count + 1))
-    done
-
-    count=1
-
-    for service in "\${services[@]}"; do
-        echo "\$count. \$service (\${service_replicas[((\$count - 1))]} replicas)"
-        count=\$((count + 1))
-    done
-
-    echo "A. All"
-    echo "0. Back to main menu"
-    echo "Enter your choice: "
-    read log_choice
-    echo
-
-    if [[ "\$log_choice" =~ ^[0-9]+\$ ]] && [ "\$log_choice" -gt 0 ] && [ "\$log_choice" -lt "\$count" ]; then
-        service_index=\$((log_choice-1))
-        service="\${services[\$service_index]}"
-        num_replicas="\${service_replicas[\$service_index]}"
-
-        if [ "\$num_replicas" -gt 1 ]; then
-            trap 'show_logs_sub_menu "\$service" "\$num_replicas"' INT
-            show_logs_sub_menu "\$service" "\$num_replicas"
-            trap - INT
-        else
-            trap 'show_logs' INT
-            $DOCKER_COMMAND compose logs -f "\$service"
-        fi
-    elif [ "\$log_choice" == "A" ] || [ "\$log_choice" == "a" ]; then
-        trap 'show_logs' INT
-        $DOCKER_COMMAND compose logs -f
-    elif [ "\$log_choice" == "0" ]; then
-        return
-    else
-        show_logs
-    fi
-
-    trap - INT
-}
-
-# Function to restart the service
-restart_service() {
-    echo -e "\nRestarting nocodb..."
-    $DOCKER_COMMAND compose restart
-}
-
-# Function to upgrade the service
-upgrade_service() {
-    echo -e "\nUpgrading nocodb..."
-    $DOCKER_COMMAND compose pull
-    $DOCKER_COMMAND compose up -d --force-recreate
-    $DOCKER_COMMAND image prune -a -f
-}
-
-# Function to scale the service
-scale_service() {
-    num_cores=\$(nproc || sysctl -n hw.ncpu || echo 1)
-    current_scale=\$($DOCKER_COMMAND compose ps -q nocodb | wc -l)
-    echo -e "\nCurrent number of instances: \$current_scale"
-    echo "How many instances of NocoDB do you want to run (Maximum: \${num_cores}) ? (default: 1): "
-    scale_num=\$(read_number_range 1 \$num_cores)
-
-    if [ \$scale_num -eq \$current_scale ]; then
-        echo "Number of instances is already set to \$scale_num. Returning to main menu."
-        return
-    fi
-
-    $DOCKER_COMMAND compose up -d --scale nocodb=\$scale_num
-}
-
-# Function for basic monitoring
-monitoring_service() {
-    echo -e '\nLoading stats...'
-    trap ' ' INT
-    $DOCKER_COMMAND stats
-}
-
-# Main program loop
-while true; do
-    trap - INT
-    show_menu
-    echo "Enter your choice: "
-
-    read choice
-    case \$choice in
-        1) start_service && MSG="NocoDB Started" ;;
-        2) stop_service && MSG="NocoDB Stopped" ;;
-        3) show_logs ;;
-        4) restart_service && MSG="NocoDB Restarted" ;;
-        5) upgrade_service && MSG="NocoDB has been upgraded to latest version" ;;
-        6) scale_service && MSG="NocoDB has been scaled" ;;
-        7) monitoring_service ;;
-        0) exit 0 ;;
-        *) MSG="\nInvalid choice. Please select a correct option." ;;
-    esac
-done
-EOF
-
-message_arr+=("Help script: help.sh")
-
 cat > ./update.sh <<EOF
 $DOCKER_COMMAND compose pull
 $DOCKER_COMMAND compose up -d --force-recreate
@@ -781,4 +812,11 @@ fi
 print_box_message "${message_arr[@]}"
 
 # *************************** SETUP END  *************************************
-# ******************************************************************************
+# ****************************************************************************
+
+echo "Do you want to start the management menu [Y/N] (default: Y): "
+read -r MANAGEMENT_MENU
+
+if [ -z "$MANAGEMENT_MENU" ] || { [ "$MANAGEMENT_MENU" != "N" ] && [ "$MANAGEMENT_MENU" != "n" ]; }; then
+    management_menu
+fi
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/configure/monitor.bats b/docker-compose/setup-script/tests/configure/monitor.bats
new file mode 100755
index 0000000000..ae20a2d85f
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/monitor.bats
@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/configure" || exit 1
+  ./setup.sh "setup"
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Properly runs monitor script" {
+    ../expects/configure/restart.sh
+
+    cd "${NOCO_HOME}" || exit 1
+
+    # Verify container is running
+    docker compose ps | grep -q 'redis'
+    docker compose ps | grep -q 'watchtower'
+    docker compose ps | grep -q 'nocodb'
+}
diff --git a/docker-compose/setup-script/tests/configure/restart.bats b/docker-compose/setup-script/tests/configure/restart.bats
new file mode 100755
index 0000000000..2f92868882
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/restart.bats
@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/configure" || exit 1
+  ./setup.sh "setup"
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check all containers are restarted" {
+    ../expects/configure/restart.sh
+
+    cd "${NOCO_HOME}" || exit 1
+
+    # Verify container is running
+    docker compose ps | grep -q 'redis'
+    docker compose ps | grep -q 'watchtower'
+    docker compose ps | grep -q 'nocodb'
+}
diff --git a/docker-compose/setup-script/tests/configure/scale.bats b/docker-compose/setup-script/tests/configure/scale.bats
new file mode 100755
index 0000000000..b2bbadd45d
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/scale.bats
@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/configure" || exit 1
+  ./setup.sh "setup"
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check NocoDB is scaled to 3 instances" {
+    nproc() {
+        echo 4
+    }
+
+    ../expects/configure/scale.sh
+
+    cd "${NOCO_HOME}" || exit 1
+
+    result=$(docker compose ps | grep -c "nocodb/nocodb")
+    [ "${result}" -eq 3 ]
+}
diff --git a/docker-compose/setup-script/tests/configure/setup.sh b/docker-compose/setup-script/tests/configure/setup.sh
new file mode 100755
index 0000000000..3eee2485b5
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/setup.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -z "$NOCO_HOME" ]; then
+    NOCO_HOME="${HOME}/.nocodb"
+fi
+
+if [ -d "$NOCO_HOME" ]; then
+    cd "$NOCO_HOME" || exit
+    docker compose down
+fi
+
+cd "$WORKING_DIR" || exit
+rm -rf "$NOCO_HOME"
+
+if [ "$1" = "setup" ]; then
+  ../noco.sh <<< $'\n\nN\n'
+fi
diff --git a/docker-compose/setup-script/tests/configure/start.bats b/docker-compose/setup-script/tests/configure/start.bats
new file mode 100755
index 0000000000..b438e516eb
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/start.bats
@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/configure" || exit 1
+  ./setup.sh "setup"
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check all containers are up" {
+    ../expects/configure/start.sh
+
+    cd "${NOCO_HOME}" || exit 1
+
+    # Verify container is running
+    docker compose ps | grep -q 'redis'
+    docker compose ps | grep -q 'watchtower'
+    docker compose ps | grep -q 'nocodb'
+}
diff --git a/docker-compose/setup-script/tests/configure/stop.bats b/docker-compose/setup-script/tests/configure/stop.bats
new file mode 100755
index 0000000000..47f202dfa4
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/stop.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/configure" || exit 1
+  ./setup.sh setup
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check all containers are down" {
+    ../expects/configure/stop.sh
+
+    cd "${NOCO_HOME}" || exit 1
+
+    # Verify container is not running
+    count=$(docker compose ps -q | wc -l)
+    [ "$count" -eq 0 ]
+}
diff --git a/docker-compose/setup-script/tests/configure/upgrade.bats b/docker-compose/setup-script/tests/configure/upgrade.bats
new file mode 100755
index 0000000000..b0e9f6275a
--- /dev/null
+++ b/docker-compose/setup-script/tests/configure/upgrade.bats
@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/configure" || exit 1
+  ./setup.sh "setup"
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check all containers are upgraded" {
+    ../expects/configure/upgrade.sh
+
+    cd "${NOCO_HOME}" || exit 1
+
+    # Verify container is running
+    docker compose ps | grep -q 'redis'
+    docker compose ps | grep -q 'watchtower'
+    docker compose ps | grep -q 'nocodb'
+}
diff --git a/docker-compose/setup-script/tests/expects/configure/monitor.sh b/docker-compose/setup-script/tests/expects/configure/monitor.sh
new file mode 100755
index 0000000000..ba7479de81
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/configure/monitor.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+expect "Do you want to reinstall NocoDB*"
+send "N\r"
+
+expect "Enter your choice: "
+send "7\r"
+
+send \x03
+
+expect "Enter your choice: "
+send "0\r"
+
+expect EOF
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/expects/configure/restart.sh b/docker-compose/setup-script/tests/expects/configure/restart.sh
new file mode 100755
index 0000000000..7abddf658c
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/configure/restart.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+expect "Do you want to reinstall NocoDB*"
+send "N\r"
+
+expect "Enter your choice: "
+send "4\r"
+
+expect "Enter your choice: "
+send "0\r"
+
+expect EOF
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/expects/configure/scale.sh b/docker-compose/setup-script/tests/expects/configure/scale.sh
new file mode 100755
index 0000000000..2f3196ade7
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/configure/scale.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+expect "Do you want to reinstall NocoDB*"
+send "N\r"
+
+expect "Enter your choice: "
+send "6\r"
+
+expect "How many instances of NocoDB do you want to run*"
+send "3\r"
+
+expect "Enter your choice: "
+send "0\r"
+
+expect EOF
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/expects/configure/start.sh b/docker-compose/setup-script/tests/expects/configure/start.sh
new file mode 100755
index 0000000000..ed8796c965
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/configure/start.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+expect "Do you want to reinstall NocoDB*"
+send "N\r"
+
+expect "Enter your choice: "
+send "1\r"
+
+expect "Enter your choice: "
+send "0\r"
+
+expect EOF
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/expects/configure/stop.sh b/docker-compose/setup-script/tests/expects/configure/stop.sh
new file mode 100755
index 0000000000..78ef89592a
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/configure/stop.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+expect "Do you want to reinstall NocoDB*"
+send "N\r"
+
+expect "Enter your choice: "
+send "2\r"
+
+expect "Enter your choice: "
+send "0\r"
+
+expect EOF
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/expects/configure/upgrade.sh b/docker-compose/setup-script/tests/expects/configure/upgrade.sh
new file mode 100755
index 0000000000..c03edb366d
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/configure/upgrade.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+expect "Do you want to reinstall NocoDB*"
+send "N\r"
+
+expect "Enter your choice: "
+send "5\r"
+
+expect "Enter your choice: "
+send "0\r"
+
+expect EOF
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/expects/install/default.sh b/docker-compose/setup-script/tests/expects/install/default.sh
new file mode 100755
index 0000000000..fa4fb58d3a
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/install/default.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+# Respond to script prompts
+expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
+send "\r"
+
+expect "Show Advanced Options*"
+send "\r"
+
+expect "Do you want to start the management menu*"
+send "N\r"
+
+expect eof
diff --git a/docker-compose/setup-script/tests/expects/install/ip.sh b/docker-compose/setup-script/tests/expects/install/ip.sh
new file mode 100755
index 0000000000..957a677efe
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/install/ip.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/expect -f
+# shellcheck shell=bash
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+# Respond to script prompts
+expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
+send "192.168.1.10\r"
+
+expect "Show Advanced Options*"
+send "\r"
+
+expect "Do you want to start the management menu*"
+send "N\r"
+
+expect eof
diff --git a/docker-compose/setup-script/tests/expects/install/redis.sh b/docker-compose/setup-script/tests/expects/install/redis.sh
new file mode 100755
index 0000000000..c3420a3007
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/install/redis.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+# Respond to script prompts
+expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
+send "\r"
+
+expect "Show Advanced Options*"
+send "Y\r"
+
+expect "Choose Community or Enterprise Edition*"
+send "\r"
+
+expect "Do you want to enabled Redis for caching*"
+send "Y\r"
+
+expect "Do you want to enabled Watchtower for automatic updates*"
+send "\r"
+
+expect "How many instances of NocoDB do you want to run*"
+send "\r"
+
+expect "Do you want to start the management menu*"
+send "N\r"
+
+expect eof
diff --git a/docker-compose/setup-script/tests/expects/install/scale.sh b/docker-compose/setup-script/tests/expects/install/scale.sh
new file mode 100755
index 0000000000..584fb87cf7
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/install/scale.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+# Respond to script prompts
+expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
+send "\r"
+
+expect "Show Advanced Options*"
+send "Y\r"
+
+expect "Choose Community or Enterprise Edition*"
+send "\r"
+
+expect "Do you want to enabled Redis for caching*"
+send "Y\r"
+
+expect "Do you want to enabled Watchtower for automatic updates*"
+send "\r"
+
+expect "How many instances of NocoDB do you want to run*"
+send "2\r"
+
+expect "Do you want to start the management menu*"
+send "N\r"
+
+expect eof
diff --git a/docker-compose/setup-script/tests/expects/install/ssl.sh b/docker-compose/setup-script/tests/expects/install/ssl.sh
new file mode 100755
index 0000000000..229896067d
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/install/ssl.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+set random_number [lindex $argv 0]
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+# Respond to script prompts
+expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
+send "${random_number}.ssl.nocodb.dev\r"
+
+expect "Show Advanced Options*"
+send "y\r"
+
+expect "Do you want to configure SSL*"
+send "y\r"
+
+expect "Choose Community or Enterprise Edition*"
+send "\r"
+
+expect "Do you want to enabled Redis for caching*"
+send "Y\r"
+
+expect "Do you want to enabled Watchtower for automatic updates*"
+send "\r"
+
+expect "How many instances of NocoDB do you want to run*"
+send "\r"
+
+expect "Do you want to start the management menu*"
+send "N\r"
+
+expect eof
diff --git a/docker-compose/setup-script/tests/expects/install/watchtower.sh b/docker-compose/setup-script/tests/expects/install/watchtower.sh
new file mode 100755
index 0000000000..eeb4f6e493
--- /dev/null
+++ b/docker-compose/setup-script/tests/expects/install/watchtower.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/expect -f
+
+# Configure timeout for each expect command
+set timeout 10
+
+# Start your main script
+set env(PATH) "$env(WORKING_DIR)/mocks:$env(PATH)"
+
+spawn bash ../../noco.sh
+
+# Respond to script prompts
+expect "Enter the IP address or domain name for the NocoDB instance (default: localhost):"
+send "\r"
+
+expect "Show Advanced Options*"
+send "Y\r"
+
+expect "Choose Community or Enterprise Edition*"
+send "\r"
+
+expect "Do you want to enabled Redis for caching*"
+send "\r"
+
+expect "Do you want to enabled Watchtower for automatic updates*"
+send "Y\r"
+
+expect "How many instances of NocoDB do you want to run*"
+send "\r"
+
+expect "Do you want to start the management menu*"
+send "N\r"
+
+expect eof
diff --git a/docker-compose/setup-script/tests/install/default.bats b/docker-compose/setup-script/tests/install/default.bats
new file mode 100755
index 0000000000..ef6e758d23
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/default.bats
@@ -0,0 +1,36 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check installation with all default options" {
+    ../expects/install/default.sh
+
+    cd "${NOCO_HOME}"
+
+    # Check Docker Compose file to verify configuration
+    grep -q 'redis' docker-compose.yml
+    grep -q 'watchtower' docker-compose.yml
+    grep -q 'nocodb' docker-compose.yml
+
+    # Verify container is running
+    docker compose ps | grep -q 'redis'
+    docker compose ps | grep -q 'watchtower'
+    docker compose ps | grep -q 'nocodb'
+}
diff --git a/docker-compose/setup-script/tests/install/ip.bats b/docker-compose/setup-script/tests/install/ip.bats
new file mode 100755
index 0000000000..e3fbc1b547
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/ip.bats
@@ -0,0 +1,36 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/install" || exit 1
+  ./setup.sh
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check installation with custom ip" {
+    ../expects/install/ip.sh
+
+    cd "${NOCO_HOME}"
+
+    # Check Docker Compose file to verify configuration
+    grep -q 'redis' docker-compose.yml
+    grep -q 'watchtower' docker-compose.yml
+    grep -q 'nocodb' docker-compose.yml
+
+    # Verify container is running
+    docker compose ps | grep -q 'redis'
+    docker compose ps | grep -q 'watchtower'
+    docker compose ps | grep -q 'nocodb'
+}
diff --git a/docker-compose/setup-script/tests/install/redis.bats b/docker-compose/setup-script/tests/install/redis.bats
new file mode 100755
index 0000000000..fba5db9add
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/redis.bats
@@ -0,0 +1,32 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/install" || exit 1
+  ./setup.sh
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check Redis is enabled when specified" {
+    ../expects/install/redis.sh
+
+    cd "${NOCO_HOME}"
+
+    # Check Docker Compose file to verify Redis configuration
+    grep -q 'redis' docker-compose.yml
+
+    # Verify Redis container is running
+    docker compose ps | grep -q 'redis'
+}
diff --git a/docker-compose/setup-script/tests/install/scale.bats b/docker-compose/setup-script/tests/install/scale.bats
new file mode 100755
index 0000000000..73d3e325e5
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/scale.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+
+
+setup() {
+  cd "${WORKING_DIR}/install" || exit 1
+  ./setup.sh
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check if two instances of NoCoDB can be run" {
+    ../expects/install/scale.sh
+
+    cd "${NOCO_HOME}"
+
+    # Get scale from docker compose ps
+    scale=$(docker compose ps | grep -c "nocodb/nocodb")
+    [ "$scale" -eq 2 ]
+}
diff --git a/docker-compose/setup-script/tests/install/setup.sh b/docker-compose/setup-script/tests/install/setup.sh
new file mode 100755
index 0000000000..2397e20809
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/setup.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ -z "$NOCO_HOME" ]; then
+    NOCO_HOME="${HOME}/.nocodb"
+fi
+
+if [ -d "$NOCO_HOME" ]; then
+    cd "$NOCO_HOME" || exit
+    docker compose down
+fi
+
+rm -rf "$NOCO_HOME"
diff --git a/docker-compose/setup-script/tests/install/ssl.bats b/docker-compose/setup-script/tests/install/ssl.bats
new file mode 100644
index 0000000000..705120b7af
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/ssl.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+
+
+RANDOM_NUMBER=$RANDOM
+
+setup() {
+  cd "${WORKING_DIR}/install" || exit 1
+  ./setup.sh
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Should create SSL certificates" {
+    if [ -z "$TEST_SSL" ]
+    then
+        skip "Skipping SSL tests"
+    fi
+
+    ../expects/install/ssl.sh "$RANDOM_NUMBER"
+
+    curl -ksS --head "https://${RANDOM_NUMBER}.ssl.nocodb.dev" > /dev/null
+}
diff --git a/docker-compose/setup-script/tests/install/watchtower.bats b/docker-compose/setup-script/tests/install/watchtower.bats
new file mode 100755
index 0000000000..32c988809c
--- /dev/null
+++ b/docker-compose/setup-script/tests/install/watchtower.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+NOCO_HOME="${HOME}/.nocodb"
+export NOCO_HOME
+
+setup() {
+  cd "${WORKING_DIR}/install" || exit 1
+  ./setup.sh
+}
+
+teardown() {
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
+}
+
+@test "Check WatchTower is enabled when specified" {
+    ../expects/install/watchtower.sh
+
+    cd "${NOCO_HOME}"
+
+    # Check Docker Compose file to verify WatchTower configuration
+    grep -q 'watchtower' docker-compose.yml
+
+    # Verify WatchTower container is running
+    docker compose ps | grep -q 'watchtower'
+}
diff --git a/docker-compose/setup-script/tests/mocks/clear b/docker-compose/setup-script/tests/mocks/clear
new file mode 100755
index 0000000000..e08f792e8f
--- /dev/null
+++ b/docker-compose/setup-script/tests/mocks/clear
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "--- Clear Mock ---"
\ No newline at end of file
diff --git a/docker-compose/setup-script/tests/mocks/nproc b/docker-compose/setup-script/tests/mocks/nproc
new file mode 100755
index 0000000000..1d83c4a9b0
--- /dev/null
+++ b/docker-compose/setup-script/tests/mocks/nproc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo 4
\ No newline at end of file
diff --git a/packages/nc-gui/assets/nc-icons/arrow-up-right.svg b/packages/nc-gui/assets/nc-icons/arrow-up-right.svg
new file mode 100644
index 0000000000..b0b9d3026b
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/arrow-up-right.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.66666 11.3334L11.3333 4.66675" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.66666 4.66675H11.3333V11.3334" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/control-panel.svg b/packages/nc-gui/assets/nc-icons/control-panel.svg
new file mode 100644
index 0000000000..c566e17b96
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/control-panel.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 14V6" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 6H14" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/home.svg b/packages/nc-gui/assets/nc-icons/home.svg
new file mode 100644
index 0000000000..fe8bdeb742
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/home.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2 5.99992L8 1.33325L14 5.99992V13.3333C14 13.6869 13.8595 14.026 13.6095 14.2761C13.3594 14.5261 13.0203 14.6666 12.6667 14.6666H3.33333C2.97971 14.6666 2.64057 14.5261 2.39052 14.2761C2.14048 14.026 2 13.6869 2 13.3333V5.99992Z" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M6 14.6667V8H10V14.6667" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/office.svg b/packages/nc-gui/assets/nc-icons/office.svg
new file mode 100644
index 0000000000..b2b313eaf4
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/office.svg
@@ -0,0 +1,10 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_130_18151)">
+<path d="M31 31.3606H0.999999C0.800999 31.3606 0.639999 31.1996 0.639999 31.0006V1.00063C0.639999 0.801625 0.800999 0.640625 0.999999 0.640625H19C19.199 0.640625 19.36 0.801625 19.36 1.00063V3.64062H25C25.199 3.64062 25.36 3.80163 25.36 4.00063V7.64062H31C31.199 7.64062 31.36 7.80163 31.36 8.00063V31.0006C31.36 31.1996 31.199 31.3606 31 31.3606ZM19.36 30.6406H30.64V8.36062H19.36V30.6406ZM12.36 30.6406H18.64V1.36063H1.36V30.6406H7.64V23.0006C7.64 22.8016 7.801 22.6406 8 22.6406H12C12.199 22.6406 12.36 22.8016 12.36 23.0006V30.6406ZM8.36 30.6406H11.64V23.3606H8.36V30.6406ZM19.36 7.64062H24.639V4.36063H19.36V7.64062ZM27.36 25.0006H26.64V23.0006H27.361L27.36 25.0006ZM23.36 25.0006H22.64V23.0006H23.361L23.36 25.0006ZM16.36 25.0006H15.64V23.0006H16.36V25.0006ZM4.36 25.0006H3.64V23.0006H4.36V25.0006ZM27.36 19.0006H26.64V17.0006H27.361L27.36 19.0006ZM23.36 19.0006H22.64V17.0006H23.361L23.36 19.0006ZM16.36 19.0006H15.64V17.0006H16.36V19.0006ZM12.36 19.0006H11.64V17.0006H12.36V19.0006ZM8.36 19.0006H7.64V17.0006H8.36V19.0006ZM4.36 19.0006H3.64V17.0006H4.36V19.0006ZM27.36 13.0006H26.64V11.0006H27.361L27.36 13.0006ZM23.36 13.0006H22.64V11.0006H23.361L23.36 13.0006ZM16.36 13.0006H15.64V11.0006H16.36V13.0006ZM12.36 13.0006H11.64V11.0006H12.36V13.0006ZM8.36 13.0006H7.64V11.0006H8.36V13.0006ZM4.36 13.0006H3.64V11.0006H4.36V13.0006ZM16.36 7.00063H15.64V5.00063H16.36V7.00063ZM12.36 7.00063H11.64V5.00063H12.36V7.00063ZM8.36 7.00063H7.64V5.00063H8.36V7.00063ZM4.36 7.00063H3.64V5.00063H4.36V7.00063Z" fill="currentColor"/>
+</g>
+<defs>
+<clipPath id="clip0_130_18151">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/slash.svg b/packages/nc-gui/assets/nc-icons/slash.svg
new file mode 100644
index 0000000000..8e7e27899e
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/slash.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="slash" clip-path="url(#clip0_311_1327)">
+<path id="Vector" d="M7.99998 14.6668C11.6819 14.6668 14.6666 11.6821 14.6666 8.00016C14.6666 4.31826 11.6819 1.3335 7.99998 1.3335C4.31808 1.3335 1.33331 4.31826 1.33331 8.00016C1.33331 11.6821 4.31808 14.6668 7.99998 14.6668Z" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_2" d="M3.28662 3.28662L12.7133 12.7133" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_311_1327">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/nc-gui/assets/nc-icons/workspace.svg b/packages/nc-gui/assets/nc-icons/workspace.svg
new file mode 100644
index 0000000000..52c0757116
--- /dev/null
+++ b/packages/nc-gui/assets/nc-icons/workspace.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="0.5" y="0.5" width="15" height="15" rx="3.5" fill="none"/>
+    <rect x="0.5" y="0.5" width="15" height="15" rx="3.5" stroke="currentColor"/>
+</svg>
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 65ec91122e..d8831e794d 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -109,7 +109,7 @@ watch(
   <nuxt-link
     v-else-if="validEmail"
     no-ref
-    class="py-1 underline hover:opacity-75 inline-block nc-cell-field-link"
+    class="py-1 underline hover:opacity-75 inline-block nc-cell-field-link max-w-full"
     :href="`mailto:${vModel}`"
     target="_blank"
     :tabindex="readOnly ? -1 : 0"
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index 4f94f7924b..c4c73d3434 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -121,7 +121,7 @@ watch(
       v-else-if="isValid && !cellUrlOptions?.overlay"
       no-prefetch
       no-rel
-      class="py-1 z-3 underline hover:opacity-75 nc-cell-field-link"
+      class="py-1 z-3 underline hover:opacity-75 nc-cell-field-link max-w-full"
       :to="url"
       :target="cellUrlOptions?.behavior === 'replace' ? undefined : '_blank'"
       :tabindex="readOnly ? -1 : 0"
@@ -133,7 +133,7 @@ watch(
       v-else-if="isValid && !disableOverlay && cellUrlOptions?.overlay"
       no-prefetch
       no-rel
-      class="py-1 z-3 w-full h-full text-center !no-underline hover:opacity-75 nc-cell-field-link"
+      class="py-1 z-3 w-full h-full text-center !no-underline hover:opacity-75 nc-cell-field-link max-w-full"
       :to="url"
       :target="cellUrlOptions?.behavior === 'replace' ? undefined : '_blank'"
       :tabindex="readOnly ? -1 : 0"
diff --git a/packages/nc-gui/components/dashboard/Sidebar/EEMenuOption.vue b/packages/nc-gui/components/dashboard/Sidebar/EEMenuOption.vue
new file mode 100644
index 0000000000..b95f1483e9
--- /dev/null
+++ b/packages/nc-gui/components/dashboard/Sidebar/EEMenuOption.vue
@@ -0,0 +1,3 @@
+<template>
+  <span></span>
+</template>
diff --git a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
index c3efd5f604..f340b5bab6 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
@@ -20,12 +20,14 @@ const { isMobileMode } = useGlobal()
 const logout = async () => {
   isLoggingOut.value = true
   try {
+    const isSsoUser = !!(user?.value as any)?.sso_client_id
+
     await signOut(false)
 
     // No need as all stores are cleared on signout
     // await clearWorkspaces()
 
-    await navigateTo('/signin')
+    await navigateTo(isSsoUser ? '/sso' : '/signin')
   } catch (e) {
     console.error(e)
   } finally {
@@ -167,6 +169,8 @@ onMounted(() => {
 
             <NcDivider />
 
+            <DashboardSidebarEEMenuOption v-if="isEeUI" />
+
             <nuxt-link v-e="['c:user:settings']" class="!no-underline" to="/account/profile">
               <NcMenuItem> <GeneralIcon icon="ncSettings" class="menu-icon" /> {{ $t('title.accountSettings') }} </NcMenuItem>
             </nuxt-link>
diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue
index 400d29a878..96ef06ed9a 100644
--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue
+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue
@@ -290,11 +290,11 @@ const isEditBaseModalOpen = computed({
 <template>
   <div class="flex flex-row w-full h-full nc-data-sources-view">
     <div class="flex flex-col w-full overflow-auto">
-      <div class="flex flex-row w-full justify-end mt-6 mb-5">
+      <div class="flex flex-row w-full justify-end mt-6.5 mb-2">
         <NcButton
           v-if="dataSourcesAwakened"
           size="large"
-          class="z-10 !rounded-lg !px-2 mr-2.5"
+          class="z-10 !px-2"
           type="primary"
           @click="vState = DataSourcesSubTab.New"
         >
diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/dlg/InviteDlg.vue
similarity index 60%
rename from packages/nc-gui/components/project/ShareBaseDlg.vue
rename to packages/nc-gui/components/dlg/InviteDlg.vue
index e7a855060d..9af903454a 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/dlg/InviteDlg.vue
@@ -1,30 +1,43 @@
-<script setup lang="ts">
-import type { RoleLabels } from 'nocodb-sdk'
-import { OrderedProjectRoles, ProjectRoles } from 'nocodb-sdk'
+<script lang="ts" setup>
+import { ProjectRoles, type RoleLabels, WorkspaceUserRoles } from 'nocodb-sdk'
 import type { User } from '#imports'
+
 import { extractEmail } from '~/helpers/parsers/parserHelpers'
 
 const props = defineProps<{
   modelValue: boolean
+  type?: 'base' | 'workspace' | 'organization'
   baseId?: string
+  emails?: string[]
+  workspaceId?: string
 }>()
 const emit = defineEmits(['update:modelValue'])
 
-const dialogShow = useVModel(props, 'modelValue', emit)
-
-const inviteData = reactive({
-  email: '',
-  roles: ProjectRoles.NO_ACCESS,
-})
-
-const { baseRoles } = useRoles()
+const { baseRoles, workspaceRoles } = useRoles()
 
 const basesStore = useBases()
 
-const { activeProjectId } = storeToRefs(basesStore)
+const workspaceStore = useWorkspace()
 
 const { createProjectUser } = basesStore
 
+const { inviteCollaborator: inviteWsCollaborator } = workspaceStore
+
+const dialogShow = useVModel(props, 'modelValue', emit)
+
+const orderedRoles = computed(() => {
+  return props.type === 'base' ? ProjectRoles : WorkspaceUserRoles
+})
+
+const userRoles = computed(() => {
+  return props.type === 'base' ? baseRoles.value : workspaceRoles.value
+})
+
+const inviteData = reactive({
+  email: '',
+  roles: orderedRoles.value.NO_ACCESS,
+})
+
 const divRef = ref<HTMLDivElement>()
 
 const focusRef = ref<HTMLInputElement>()
@@ -35,23 +48,44 @@ const emailValidation = reactive({
   message: '',
 })
 
-const allowedRoles = ref<ProjectRoles[]>([])
+const singleEmailValue = ref('')
 
-onMounted(async () => {
-  try {
-    const currentRoleIndex = OrderedProjectRoles.findIndex(
-      (role) => baseRoles.value && Object.keys(baseRoles.value).includes(role),
-    )
-    if (currentRoleIndex !== -1) {
-      allowedRoles.value = OrderedProjectRoles.slice(currentRoleIndex + 1).filter((r) => r)
+const emailBadges = ref<Array<string>>([])
+
+const allowedRoles = ref<[]>([])
+
+const focusOnDiv = () => {
+  focusRef.value?.focus()
+  isDivFocused.value = true
+}
+
+watch(dialogShow, async (newVal) => {
+  if (newVal) {
+    try {
+      // todo: enable after discussing with anbu
+      // const currentRoleIndex = Object.values(orderedRoles.value).findIndex(
+      //   (role) => userRoles.value && Object.keys(userRoles.value).includes(role),
+      // )
+      // if (currentRoleIndex !== -1) {
+      allowedRoles.value = Object.values(orderedRoles.value) // .slice(currentRoleIndex + 1)
+      // }
+    } catch (e: any) {
+      message.error(await extractSdkResponseErrorMsg(e))
     }
-  } catch (e: any) {
-    message.error(await extractSdkResponseErrorMsg(e))
+
+    if (props.emails) {
+      emailBadges.value = props.emails
+    }
+
+    setTimeout(() => {
+      focusOnDiv()
+    }, 100)
+  } else {
+    emailBadges.value = []
+    inviteData.email = ''
+    singleEmailValue.value = ''
   }
 })
-const singleEmailValue = ref('')
-
-const emailBadges = ref<Array<string>>([])
 
 const insertOrUpdateString = (str: string) => {
   // Check if the string already exists in the array
@@ -84,7 +118,7 @@ const emailInputValidation = (input: string, isBulkEmailCopyPaste: boolean = fal
   return true
 }
 
-const isInvitButtonDiabled = computed(() => {
+const isInviteButtonDisabled = computed(() => {
   if (!emailBadges.value.length && !singleEmailValue.value.length) {
     return true
   }
@@ -95,7 +129,7 @@ const isInvitButtonDiabled = computed(() => {
 
 watch(inviteData, (newVal) => {
   // when user only want to enter a single email
-  // we dont convert that as badge
+  // we don't convert that as badge
 
   const isSingleEmailValid = validateEmail(newVal.email)
   if (isSingleEmailValid && !emailBadges.value.length) {
@@ -105,7 +139,7 @@ watch(inviteData, (newVal) => {
   }
   singleEmailValue.value = ''
 
-  // when user enters multiple emails comma sepearted or space sepearted
+  // when user enters multiple emails comma separated or space separated
   const isNewEmail = newVal.email.charAt(newVal.email.length - 1) === ',' || newVal.email.charAt(newVal.email.length - 1) === ' '
   if (isNewEmail && newVal.email.trim().length) {
     const emailToAdd = newVal.email.split(',')[0].trim() || newVal.email.split(' ')[0].trim()
@@ -140,12 +174,6 @@ const handleEnter = () => {
   emailValidation.isError = false
   emailValidation.message = ''
 }
-
-const focusOnDiv = () => {
-  focusRef.value?.focus()
-  isDivFocused.value = true
-}
-
 // remove one email per backspace
 onKeyStroke('Backspace', () => {
   if (isDivFocused.value && inviteData.email.length < 1) {
@@ -197,7 +225,9 @@ const onPaste = (e: ClipboardEvent) => {
   inviteData.email = ''
 }
 
-const inviteProjectCollaborator = async () => {
+const workSpaces = ref<NcWorkspace[]>([])
+
+const inviteCollaborator = async () => {
   try {
     const payloadData = singleEmailValue.value || emailBadges.value.join(',')
     if (!payloadData.includes(',')) {
@@ -207,10 +237,19 @@ const inviteProjectCollaborator = async () => {
         emailValidation.message = 'invalid email'
       }
     }
-    await createProjectUser(activeProjectId.value!, {
-      email: payloadData,
-      roles: inviteData.roles,
-    } as unknown as User)
+    if (props.type === 'base' && props.baseId) {
+      await createProjectUser(props.baseId!, {
+        email: payloadData,
+        roles: inviteData.roles,
+      } as unknown as User)
+    } else if (props.type === 'workspace' && props.workspaceId) {
+      await inviteWsCollaborator(payloadData, inviteData.roles, props.workspaceId)
+    } else if (props.type === 'organization') {
+      // TODO: Add support for Bulk Workspace Invite
+      for (const workspace of workSpaces.value) {
+        await inviteWsCollaborator(payloadData, inviteData.roles, workspace.id)
+      }
+    }
 
     message.success('Invitation sent successfully')
     inviteData.email = ''
@@ -223,40 +262,70 @@ const inviteProjectCollaborator = async () => {
   }
 }
 
-const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role as ProjectRoles)
+const organizationStore = useOrganization()
+
+const { listWorkspaces } = organizationStore
+
+const { workspaces } = storeToRefs(organizationStore)
+
+const workSpaceSelectList = computed(() => {
+  return workspaces.value.filter((w) => !workSpaces.value.find((ws) => ws.id === w.id))
+})
+
+const addToList = (workspaceId: string) => {
+  workSpaces.value.push(workspaces.value.find((w) => w.id === workspaceId)!)
+}
+const removeWorkspace = (workspaceId: string) => {
+  workSpaces.value = workSpaces.value.filter((w) => w.id !== workspaceId)
+}
+
+onMounted(async () => {
+  if (props.type === 'organization') {
+    await listWorkspaces()
+  }
+})
+
+const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role as ProjectRoles | WorkspaceUserRoles)
 </script>
 
 <template>
   <NcModal
     v-model:visible="dialogShow"
-    :show-separator="false"
     :header="$t('activity.createTable')"
+    :show-separator="false"
     size="medium"
+    class="nc-invite-dlg"
     @keydown.esc="dialogShow = false"
   >
     <template #header>
       <div class="flex flex-row items-center gap-x-2">
-        {{ $t('activity.addMember') }}
+        {{
+          type === 'organization'
+            ? $t('labels.addMembersToOrganization')
+            : type === 'base'
+            ? $t('activity.addMember')
+            : $t('activity.inviteToWorkspace')
+        }}
       </div>
     </template>
     <div class="flex items-center justify-between gap-3 mt-2">
-      <div class="flex w-full flex-col">
+      <div class="flex w-full gap-4 flex-col">
         <div class="flex justify-between gap-3 w-full">
           <div
             ref="divRef"
-            class="flex items-center border-1 gap-1 w-full overflow-x-auto nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96"
-            tabindex="0"
             :class="{
               'border-primary/100': isDivFocused,
               'p-1': emailBadges?.length > 1,
             }"
-            @click="focusOnDiv"
+            class="flex items-center border-1 gap-1 w-full overflow-x-scroll nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96"
+            tabindex="0"
             @blur="isDivFocused = false"
+            @click="focusOnDiv"
           >
             <span
               v-for="(email, index) in emailBadges"
               :key="email"
-              class="border-1 text-gray-800 bg-gray-100 rounded-md flex items-center px-2 py-1"
+              class="border-1 text-gray-800 first:ml-1 bg-gray-100 rounded-md flex items-center px-2 py-1"
             >
               {{ email }}
               <component
@@ -272,38 +341,65 @@ const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role
               :placeholder="$t('activity.enterEmail')"
               class="w-full min-w-36 outline-none px-2"
               data-testid="email-input"
-              @keyup.enter="handleEnter"
               @blur="isDivFocused = false"
+              @keyup.enter="handleEnter"
               @paste.prevent="onPaste"
             />
           </div>
           <RolesSelector
-            size="lg"
-            class="nc-invite-role-selector"
+            :description="false"
+            :on-role-change="onRoleChange"
             :role="inviteData.roles"
             :roles="allowedRoles"
-            :on-role-change="onRoleChange"
-            :description="false"
+            class="!min-w-[152px] nc-invite-role-selector"
+            size="lg"
           />
         </div>
 
         <span v-if="emailValidation.isError && emailValidation.message" class="ml-2 text-red-500 text-[10px] mt-1.5">{{
           emailValidation.message
         }}</span>
+
+        <template v-if="type === 'organization'">
+          <NcSelect :placeholder="$t('labels.selectWorkspace')" size="middle" @change="addToList">
+            <a-select-option v-for="workspace in workSpaceSelectList" :key="workspace.id" :value="workspace.id">
+              {{ workspace.title }}
+            </a-select-option>
+          </NcSelect>
+
+          <div class="flex flex-wrap gap-2">
+            <NcBadge v-for="workspace in workSpaces" :key="workspace.id">
+              <div class="px-2 flex gap-2 items-center py-1">
+                <GeneralWorkspaceIcon :workspace="workspace" hide-label size="small" />
+                <span class="text-gray-600">
+                  {{ workspace.title }}
+                </span>
+                <component :is="iconMap.close" class="w-3 h-3" @click="removeWorkspace(workspace.id)" />
+              </div>
+            </NcBadge>
+          </div>
+        </template>
       </div>
     </div>
     <div class="flex mt-8 justify-end">
       <div class="flex gap-2">
         <NcButton type="secondary" @click="dialogShow = false"> {{ $t('labels.cancel') }} </NcButton>
         <NcButton
-          type="primary"
+          :disabled="isInviteButtonDisabled || emailValidation.isError"
           size="medium"
-          :disabled="isInvitButtonDiabled || emailValidation.isError"
-          @click="inviteProjectCollaborator"
+          type="primary"
+          class="nc-invite-btn"
+          @click="inviteCollaborator"
         >
-          {{ $t('activity.inviteToBase') }}
+          {{ type === 'base' ? $t('activity.inviteToBase') : $t('activity.inviteToWorkspace') }}
         </NcButton>
       </div>
     </div>
   </NcModal>
 </template>
+
+<style lang="scss" scoped>
+:deep(.nc-invite-role-selector .nc-role-badge) {
+  @apply w-full;
+}
+</style>
diff --git a/packages/nc-gui/components/general/BaseIconColorPicker.vue b/packages/nc-gui/components/general/BaseIconColorPicker.vue
index d88ca36ebb..05d39a43b9 100644
--- a/packages/nc-gui/components/general/BaseIconColorPicker.vue
+++ b/packages/nc-gui/components/general/BaseIconColorPicker.vue
@@ -7,7 +7,7 @@ const props = withDefaults(
   defineProps<{
     type?: NcProjectType | string
     modelValue?: string
-    size?: 'small' | 'medium' | 'large' | 'xlarge'
+    size?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge'
     readonly?: boolean
     iconClass?: string
   }>(),
@@ -62,6 +62,7 @@ watch(
         :class="{
           'hover:bg-gray-500 hover:bg-opacity-15 cursor-pointer': !readonly,
           'bg-gray-500 bg-opacity-15': isOpen,
+          'h-5 w-5 text-base': size === 'xsmall',
           'h-6 w-6 text-lg': size === 'small',
           'h-8 w-8 text-xl': size === 'medium',
           'h-10 w-10 text-2xl': size === 'large',
diff --git a/packages/nc-gui/components/general/CopyButton.vue b/packages/nc-gui/components/general/CopyButton.vue
new file mode 100644
index 0000000000..cc2b1c6584
--- /dev/null
+++ b/packages/nc-gui/components/general/CopyButton.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import { useCopy } from '~/composables/useCopy'
+
+const props = defineProps<{
+  content?: string
+  timeout?: number
+}>()
+
+const { copy } = useCopy()
+const copied = ref(false)
+
+const copyContent = async () => {
+  await copy(props.content || '')
+  copied.value = true
+  setTimeout(() => {
+    copied.value = false
+  }, props.timeout || 2000)
+}
+</script>
+
+<template>
+  <NcButton size="xsmall" type="text" @click="copyContent">
+    <MdiCheck v-if="copied" class="h-3.5" />
+    <component :is="iconMap.copy" v-else class="text-gray-800" />
+  </NcButton>
+</template>
diff --git a/packages/nc-gui/components/general/WorkspaceIcon.vue b/packages/nc-gui/components/general/WorkspaceIcon.vue
index e5d14087ce..963078eb3f 100644
--- a/packages/nc-gui/components/general/WorkspaceIcon.vue
+++ b/packages/nc-gui/components/general/WorkspaceIcon.vue
@@ -6,6 +6,7 @@ const props = defineProps<{
   workspace: WorkspaceType | undefined
   hideLabel?: boolean
   size?: 'small' | 'medium' | 'large'
+  isRounded?: boolean
 }>()
 
 const workspaceColor = computed(() => {
@@ -24,6 +25,7 @@ const size = computed(() => props.size || 'medium')
       'min-w-4 w-4 h-4 rounded': size === 'small',
       'min-w-6 w-6 h-6 rounded-md': size === 'medium',
       'min-w-10 w-10 h-10 rounded-lg !text-base': size === 'large',
+      '!rounded-[50%]': props.isRounded,
     }"
     :style="{ backgroundColor: workspaceColor }"
   >
diff --git a/packages/nc-gui/components/nc/Badge.vue b/packages/nc-gui/components/nc/Badge.vue
index 4ba282e4a4..774b1eecbf 100644
--- a/packages/nc-gui/components/nc/Badge.vue
+++ b/packages/nc-gui/components/nc/Badge.vue
@@ -4,17 +4,18 @@ const props = withDefaults(
     color?: string
     border?: boolean
     size?: 'sm' | 'md' | 'lg'
+    rounded?: 'sm' | 'md' | 'lg'
   }>(),
   {
     border: true,
     size: 'sm',
+    rounded: 'md',
   },
 )
 </script>
 
 <template>
   <div
-    class="rounded-md px-1 flex items-center"
     :class="{
       'border-purple-500 bg-purple-100': props.color === 'purple',
       'border-blue-500 bg-blue-100': props.color === 'blue',
@@ -28,7 +29,11 @@ const props = withDefaults(
       'h-6': props.size === 'sm',
       'h-8': props.size === 'md',
       'h-10': props.size === 'lg',
+      'rounded-sm': props.rounded === 'sm',
+      'rounded-md': props.rounded === 'md',
+      'rounded-lg': props.rounded === 'lg',
     }"
+    class="px-1 flex items-center"
   >
     <slot />
   </div>
diff --git a/packages/nc-gui/components/nc/ErrorBoundary.vue b/packages/nc-gui/components/nc/ErrorBoundary.vue
index cb3ce25abd..567a956f8a 100644
--- a/packages/nc-gui/components/nc/ErrorBoundary.vue
+++ b/packages/nc-gui/components/nc/ErrorBoundary.vue
@@ -20,7 +20,7 @@ export default {
 
     onErrorCaptured((err) => {
       if (import.meta.client && (!nuxtApp.isHydrating || !nuxtApp.payload.serverRendered)) {
-        console.log('UI Error :', err)
+        console.error('UI Error :', err)
         emit('error', err)
         error.value = err
         return false
diff --git a/packages/nc-gui/components/nc/Select.vue b/packages/nc-gui/components/nc/Select.vue
index bd109bdcf2..553501fee6 100644
--- a/packages/nc-gui/components/nc/Select.vue
+++ b/packages/nc-gui/components/nc/Select.vue
@@ -3,6 +3,7 @@ const props = defineProps<{
   value?: string | string[]
   placeholder?: string
   mode?: 'multiple' | 'tags'
+  size?: 'small' | 'middle' | 'large'
   dropdownClassName?: string
   showSearch?: boolean
   // filterOptions is a function
@@ -44,6 +45,7 @@ const onChange = (value: string) => {
 <template>
   <a-select
     v-model:value="vModel"
+    :size="size"
     :allow-clear="allowClear"
     :disabled="loading"
     :dropdown-class-name="dropdownClassName"
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 9dc1e12240..66c3608398 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -1,27 +1,44 @@
 <script lang="ts" setup>
-import {
-  OrderedProjectRoles,
-  OrgUserRoles,
-  ProjectRoles,
-  WorkspaceRolesToProjectRoles,
-  extractRolesObj,
-  parseStringDateTime,
-  timeAgo,
-} from 'nocodb-sdk'
 import type { Roles, WorkspaceUserRoles } from 'nocodb-sdk'
+import { OrderedProjectRoles, OrgUserRoles, ProjectRoles, WorkspaceRolesToProjectRoles } from 'nocodb-sdk'
 import type { User } from '#imports'
 import { isEeUI, storeToRefs, useUserSorts } from '#imports'
 
+const props = defineProps<{
+  baseId?: string
+}>()
+
 const basesStore = useBases()
 const { getBaseUsers, createProjectUser, updateProjectUser, removeProjectUser } = basesStore
-const { activeProjectId } = storeToRefs(basesStore)
+const { activeProjectId, bases } = storeToRefs(basesStore)
 
-const { orgRoles, baseRoles } = useRoles()
+const { orgRoles, baseRoles, loadRoles } = useRoles()
 
 const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = useUserSorts('Project')
 
 const isSuper = computed(() => orgRoles.value?.[OrgUserRoles.SUPER_ADMIN])
 
+const orgStore = useOrg()
+const { orgId } = storeToRefs(orgStore)
+
+const isAdminPanel = inject(IsAdminPanelInj, ref(false))
+
+const { $api } = useNuxtApp()
+
+const currentBase = computedAsync(async () => {
+  let base
+  if (props.baseId) {
+    await loadRoles(props.baseId)
+    base = bases.value.get(props.baseId)
+    if (!base) {
+      base = await $api.base.read(props.baseId!)
+    }
+  } else {
+    base = bases.value.get(activeProjectId.value)
+  }
+  return base
+})
+
 const isInviteModalVisible = ref(false)
 
 interface Collaborators {
@@ -56,8 +73,9 @@ const sortedCollaborators = computed(() => {
 
 const loadCollaborators = async () => {
   try {
+    if (!currentBase.value) return
     const { users, totalRows } = await getBaseUsers({
-      baseId: activeProjectId.value!,
+      baseId: currentBase.value.id!,
       ...(!userSearchText.value ? {} : ({ searchText: userSearchText.value } as any)),
       force: true,
     })
@@ -69,12 +87,11 @@ const loadCollaborators = async () => {
         .map((user: any) => ({
           ...user,
           base_roles: user.roles,
-          roles: extractRolesObj(user.main_roles)?.[OrgUserRoles.SUPER_ADMIN]
-            ? OrgUserRoles.SUPER_ADMIN
-            : user.roles ??
-              (user.workspace_roles
-                ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
-                : ProjectRoles.NO_ACCESS),
+          roles:
+            user.roles ??
+            (user.workspace_roles
+              ? WorkspaceRolesToProjectRoles[user.workspace_roles as WorkspaceUserRoles] ?? ProjectRoles.NO_ACCESS
+              : ProjectRoles.NO_ACCESS),
         })),
     ]
   } catch (e: any) {
@@ -93,7 +110,7 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
         WorkspaceRolesToProjectRoles[currentCollaborator.workspace_roles as WorkspaceUserRoles] === roles &&
         isEeUI)
     ) {
-      await removeProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+      await removeProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
       if (
         currentCollaborator.workspace_roles &&
         WorkspaceRolesToProjectRoles[currentCollaborator.workspace_roles as WorkspaceUserRoles] === roles &&
@@ -105,11 +122,11 @@ const updateCollaborator = async (collab: any, roles: ProjectRoles) => {
       }
     } else if (currentCollaborator.base_roles) {
       currentCollaborator.roles = roles
-      await updateProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+      await updateProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
     } else {
       currentCollaborator.roles = roles
       currentCollaborator.base_roles = roles
-      await createProjectUser(activeProjectId.value!, currentCollaborator as unknown as User)
+      await createProjectUser(currentBase.value.id!, currentCollaborator as unknown as User)
     }
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
@@ -142,24 +159,50 @@ watch(isInviteModalVisible, () => {
     loadCollaborators()
   }
 })
+
+watch(currentBase, () => {
+  loadCollaborators()
+})
 </script>
 
 <template>
-  <div class="nc-collaborator-table-container mt-4 nc-access-settings-view h-[calc(100vh-8rem)]">
-    <LazyProjectShareBaseDlg v-model:model-value="isInviteModalVisible" />
+  <div
+    :class="{
+      'px-6 ': isAdminPanel,
+    }"
+    class="nc-collaborator-table-container mt-4 nc-access-settings-view h-[calc(100vh-8rem)]"
+  >
+    <div v-if="isAdminPanel" class="font-bold w-full !mb-5 text-2xl" data-rec="true">
+      <div class="flex items-center gap-3">
+        <!-- TODO: @DarkPhoenix2704 -->
+        <NuxtLink
+          :href="`/admin/${orgId}/bases`"
+          class="!hover:(text-black underline-gray-600) !text-black !underline-transparent ml-0.75 max-w-1/4"
+        >
+          {{ $t('objects.projects') }}
+        </NuxtLink>
+
+        <span class="text-2xl"> / </span>
+        <GeneralBaseIconColorPicker readonly />
+        <span class="text-base">
+          {{ currentBase?.title }}
+        </span>
+      </div>
+    </div>
+    <LazyDlgInviteDlg v-model:model-value="isInviteModalVisible" :base-id="currentBase?.id" type="base" />
     <div v-if="isLoading" class="nc-collaborators-list items-center justify-center">
       <GeneralLoader size="xlarge" />
     </div>
     <template v-else>
-      <div class="w-full flex flex-row justify-between items-baseline max-w-350 mt-6.5 mb-2 pr-0.25">
-        <a-input v-model:value="userSearchText" class="!max-w-90 !rounded-md" :placeholder="$t('title.searchMembers')">
+      <div class="w-full flex flex-row justify-between items-center max-w-350 mt-6.5 mb-2 pr-0.25">
+        <a-input v-model:value="userSearchText" :placeholder="$t('title.searchMembers')" class="!max-w-90 !rounded-md mr-4">
           <template #prefix>
             <PhMagnifyingGlassBold class="!h-3.5 text-gray-500" />
           </template>
         </a-input>
 
         <NcButton size="small" @click="isInviteModalVisible = true">
-          <div class="flex gap-1">
+          <div class="flex items-center gap-1">
             <component :is="iconMap.plus" class="w-4 h-4" />
             {{ $t('activity.addMembers') }}
           </div>
@@ -188,7 +231,7 @@ watch(isInviteModalVisible, () => {
 
             <div class="text-gray-700 user-access-grid flex items-center space-x-2">
               <span>
-                {{ $t('general.access') }}
+                {{ $t('general.role') }}
               </span>
               <LazyAccountUserMenu :direction="sortDirection.roles" field="roles" :handle-user-sort="saveOrUpdate" />
             </div>
@@ -203,17 +246,16 @@ watch(isInviteModalVisible, () => {
             >
               <div class="flex gap-3 items-center users-email-grid">
                 <GeneralUserIcon size="base" :email="collab.email" />
-                <NcTooltip v-if="collab.display_name">
-                  <template #title>
+                <div class="flex flex-col">
+                  <div class="flex gap-3">
+                    <span class="text-gray-800 capitalize font-semibold">
+                      {{ collab.display_name || collab.email.slice(0, collab.email.indexOf('@')) }}
+                    </span>
+                  </div>
+                  <span class="text-xs text-gray-600">
                     {{ collab.email }}
-                  </template>
-                  <span class="truncate">
-                    {{ collab.display_name }}
                   </span>
-                </NcTooltip>
-                <span v-else class="truncate">
-                  {{ collab.email }}
-                </span>
+                </div>
               </div>
               <div class="user-access-grid">
                 <template v-if="accessibleRoles.includes(collab.roles)">
@@ -230,7 +272,7 @@ watch(isInviteModalVisible, () => {
                   />
                 </template>
                 <template v-else>
-                  <RolesBadge :role="collab.roles" />
+                  <RolesBadge :border="false" :role="collab.roles" />
                 </template>
               </div>
               <div class="date-joined-grid">
@@ -252,6 +294,18 @@ watch(isInviteModalVisible, () => {
 </template>
 
 <style scoped lang="scss">
+.ant-input::placeholder {
+  @apply text-gray-500;
+}
+
+.ant-input:placeholder-shown {
+  @apply text-gray-500 !text-md;
+}
+
+.ant-input-affix-wrapper {
+  @apply px-4 rounded-lg py-2 w-84 border-1 focus:border-brand-500 border-gray-200 !ring-0;
+}
+
 .color-band {
   @apply w-6 h-6 left-0 top-2.5 rounded-full flex justify-center uppercase text-white font-weight-bold text-xs items-center;
 }
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 9ba0837dfe..ef8715fe64 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -3,22 +3,36 @@ import { useTitle } from '@vueuse/core'
 import NcLayout from '~icons/nc-icons/layout'
 import { isEeUI } from '#imports'
 
+const props = defineProps<{
+  baseId: string
+}>()
+
 const basesStore = useBases()
 
-const { openedProject, activeProjectId, basesUser } = storeToRefs(basesStore)
+const { openedProject, activeProjectId, basesUser, bases } = storeToRefs(basesStore)
 const { activeTables, activeTable } = storeToRefs(useTablesStore())
 const { activeWorkspace, workspaceUserCount } = storeToRefs(useWorkspace())
 
 const { navigateToProjectPage } = useBase()
 
+const isAdminPanel = inject(IsAdminPanelInj, ref(false))
+
 const router = useRouter()
 const route = router.currentRoute
 
-const { $e } = useNuxtApp()
+const { $e, $api } = useNuxtApp()
 
-/* const defaultBase = computed(() => {
-  return openedProject.value?.sources?.[0]
-}) */
+const currentBase = computed(async () => {
+  let base
+  if (props.baseId) {
+    base = bases.value.get(props.baseId)
+    if (!base) base = await $api.base.read(props.baseId!)
+  } else {
+    base = openedProject.value
+  }
+
+  return base
+})
 
 const { isUIAllowed, baseRoles } = useRoles()
 
@@ -37,7 +51,7 @@ const userCount = computed(() =>
 watch(
   () => route.value.query?.page,
   (newVal, oldVal) => {
-    if (route.value.name !== 'index-typeOrId-baseId-index-index') return
+    // if (route.value.name !== 'index-typeOrId-baseId-index-index') return
     if (newVal && newVal !== oldVal) {
       if (newVal === 'collaborator') {
         projectPageTab.value = 'collaborator'
@@ -46,11 +60,14 @@ watch(
       } else {
         projectPageTab.value = 'allTable'
       }
-
       return
     }
 
-    projectPageTab.value = 'allTable'
+    if (isAdminPanel.value) {
+      projectPageTab.value = 'collaborator'
+    } else {
+      projectPageTab.value = 'allTable'
+    }
   },
   { immediate: true },
 )
@@ -66,11 +83,11 @@ watch(projectPageTab, () => {
 })
 
 watch(
-  () => [openedProject.value?.id, openedProject.value?.title],
+  () => [currentBase.value?.id, currentBase.value?.title],
   () => {
     if (activeTable.value?.title) return
 
-    useTitle(`${openedProject.value?.title ?? activeWorkspace.value?.title ?? 'NocoDB'}`)
+    useTitle(`${currentBase.value?.title ?? activeWorkspace.value?.title ?? 'NocoDB'}`)
   },
   {
     immediate: true,
@@ -81,17 +98,18 @@ watch(
 <template>
   <div class="h-full nc-base-view">
     <div
+      v-if="!isAdminPanel"
       class="flex flex-row pl-2 pr-2 gap-1 border-b-1 border-gray-200 justify-between w-full"
       :class="{ 'nc-table-toolbar-mobile': isMobileMode, 'h-[var(--topbar-height)]': !isMobileMode }"
     >
       <div class="flex flex-row items-center gap-x-3">
         <GeneralOpenLeftSidebarBtn />
         <div class="flex flex-row items-center h-full gap-x-2.5">
-          <GeneralProjectIcon :type="openedProject?.type" :color="parseProp(openedProject?.meta).iconColor" />
+          <GeneralProjectIcon :color="parseProp(currentBase?.meta).iconColor" :type="currentBase?.type" />
           <NcTooltip class="flex font-medium text-sm capitalize truncate max-w-150" show-on-truncate-only>
-            <template #title> {{ openedProject?.title }}</template>
+            <template #title> {{ currentBase?.title }}</template>
             <span class="truncate">
-              {{ openedProject?.title }}
+              {{ currentBase?.title }}
             </span>
           </NcTooltip>
         </div>
@@ -105,7 +123,7 @@ watch(
       }"
     >
       <a-tabs v-model:activeKey="projectPageTab" class="w-full">
-        <a-tab-pane key="allTable">
+        <a-tab-pane v-if="!isAdminPanel" key="allTable">
           <template #tab>
             <div class="tab-title" data-testid="proj-view-tab__all-tables">
               <NcLayout />
@@ -143,7 +161,7 @@ watch(
               </div>
             </div>
           </template>
-          <ProjectAccessSettings />
+          <ProjectAccessSettings :base-id="currentBase.id" />
         </a-tab-pane>
         <a-tab-pane v-if="isUIAllowed('sourceCreate')" key="data-source">
           <template #tab>
diff --git a/packages/nc-gui/components/roles/Badge.vue b/packages/nc-gui/components/roles/Badge.vue
index 8da82c3c19..d402e62790 100644
--- a/packages/nc-gui/components/roles/Badge.vue
+++ b/packages/nc-gui/components/roles/Badge.vue
@@ -8,6 +8,8 @@ const props = withDefaults(
     clickable?: boolean
     inherit?: boolean
     border?: boolean
+    showIcon?: boolean
+    iconOnly?: boolean
     size?: 'sm' | 'md' | 'lg'
   }>(),
   {
@@ -15,6 +17,8 @@ const props = withDefaults(
     inherit: false,
     border: true,
     size: 'sm',
+    iconOnly: false,
+    showIcon: true,
   },
 )
 
@@ -60,8 +64,8 @@ const roleProperties = computed(() => {
         }"
       >
         <div class="flex items-center gap-2">
-          <GeneralIcon :icon="roleProperties.icon" />
-          <span class="flex whitespace-nowrap">
+          <GeneralIcon v-if="showIcon" :icon="roleProperties.icon" />
+          <span v-if="!iconOnly" class="flex whitespace-nowrap">
             {{ $t(`objects.roleType.${roleProperties.label}`) }}
           </span>
         </div>
diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue
index f3ba95290e..41470231d6 100644
--- a/packages/nc-gui/components/roles/Selector.vue
+++ b/packages/nc-gui/components/roles/Selector.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup>
-import { RoleDescriptions } from 'nocodb-sdk'
 import type { RoleLabels } from 'nocodb-sdk'
+import { RoleDescriptions } from 'nocodb-sdk'
 import type { SelectValue } from 'ant-design-vue/es/select'
 import { toRef } from '#imports'
 
 const props = withDefaults(
   defineProps<{
+    border?: boolean
     role: keyof typeof RoleLabels
     roles: (keyof typeof RoleLabels)[]
     description?: boolean
@@ -14,6 +15,7 @@ const props = withDefaults(
     size?: 'sm' | 'md' | 'lg'
   }>(),
   {
+    border: true,
     description: true,
     size: 'sm',
   },
@@ -36,7 +38,7 @@ function onChangeRole(val: SelectValue) {
 
 <template>
   <div ref="dropdownRef" size="lg" class="nc-roles-selector relative" @click="isDropdownOpen = !isDropdownOpen">
-    <RolesBadge data-testid="roles" :role="roleRef" :inherit="inheritRef === role" :size="sizeRef" clickable />
+    <RolesBadge :border="false" :inherit="inheritRef === role" :role="roleRef" :size="sizeRef" clickable data-testid="roles" />
     <a-select
       :value="roleRef"
       :open="isDropdownOpen"
@@ -54,7 +56,7 @@ function onChangeRole(val: SelectValue) {
           class="flex flex-col nc-role-select-dropdown gap-1"
         >
           <div class="flex items-center justify-between">
-            <RolesBadge :class="`nc-role-select-${rl}`" :role="rl" :inherit="inheritRef === rl" :border="false" />
+            <RolesBadge :border="false" :class="`nc-role-select-${rl}`" :inherit="inheritRef === rl" :role="rl" />
             <GeneralIcon v-if="rl === roleRef" icon="check" class="text-primary" />
           </div>
           <div v-if="descriptionRef" class="text-gray-500 text-xs">{{ RoleDescriptions[rl] }}</div>
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index fb8fb8d7c4..8a26b7fa98 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -112,6 +112,17 @@ const syncValue = useDebounceFn(
   { maxWait: 2000 },
 )
 
+let saveTimer: number
+
+const updateWhenEditCompleted = () => {
+  if (editEnabled.value) {
+    if (saveTimer) clearTimeout(saveTimer)
+    saveTimer = window.setTimeout(updateWhenEditCompleted, 500)
+  } else {
+    emit('save')
+  }
+}
+
 const vModel = computed({
   get: () => {
     return props.modelValue
@@ -122,7 +133,9 @@ const vModel = computed({
     } else if (val !== props.modelValue) {
       currentRow.value.rowMeta.changed = true
       emit('update:modelValue', val)
-      if (isAutoSaved(column.value)) {
+      if (column.value.pk) {
+        updateWhenEditCompleted()
+      } else if (isAutoSaved(column.value)) {
         syncValue()
       } else if (!isManualSaved(column.value)) {
         emit('save')
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
index 3dd1691ea0..08d545d881 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateField.vue
@@ -18,16 +18,23 @@ const fields = inject(FieldsInj, ref())
 
 const { fields: _fields } = useViewColumnsOrThrow()
 
-const getFieldStyle = (field: ColumnType) => {
-  const fi = _fields.value?.find((f) => f.title === field.title)
+const fieldStyles = computed(() => {
+  if (!_fields.value) return new Map()
+  return new Map(
+    _fields.value.map((field) => [
+      field.fk_column_id,
+      {
+        underline: field.underline,
+        bold: field.bold,
+        italic: field.italic,
+      },
+    ]),
+  )
+})
 
-  return {
-    underline: fi?.underline,
-    bold: fi?.bold,
-    italic: fi?.italic,
-  }
+const getFieldStyle = (field: ColumnType) => {
+  return fieldStyles.value.get(field.id)
 }
-
 // We loop through all the records and calculate the position of each record based on the range
 // We only need to calculate the top, of the record since there is no overlap in the day view of date Field
 const recordsAcrossAllRange = computed<Row[]>(() => {
diff --git a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
index 4963c2cf35..2d86898e74 100644
--- a/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue
@@ -28,15 +28,22 @@ const fields = inject(FieldsInj, ref())
 
 const { fields: _fields } = useViewColumnsOrThrow()
 
-const getFieldStyle = (field: ColumnType) => {
-  if (!_fields.value) return { underline: false, bold: false, italic: false }
-  const fi = _fields.value.find((f) => f.title === field.title)
+const fieldStyles = computed(() => {
+  if (!_fields.value) return new Map()
+  return new Map(
+    _fields.value.map((field) => [
+      field.fk_column_id,
+      {
+        underline: field.underline,
+        bold: field.bold,
+        italic: field.italic,
+      },
+    ]),
+  )
+})
 
-  return {
-    underline: fi?.underline,
-    bold: fi?.bold,
-    italic: fi?.italic,
-  }
+const getFieldStyle = (field: ColumnType) => {
+  return fieldStyles.value.get(field.id)
 }
 
 const hours = computed(() => {
@@ -49,36 +56,38 @@ const hours = computed(() => {
   return hours
 })
 
-const calculateNewDates = ({
-  endDate,
-  startDate,
-  scheduleStart,
-  scheduleEnd,
-}: {
-  endDate: dayjs.Dayjs
-  startDate: dayjs.Dayjs
-  scheduleStart: dayjs.Dayjs
-  scheduleEnd: dayjs.Dayjs
-}) => {
-  // If there is no end date, we add 15 minutes to the start date and use that as the end date
-  if (!endDate.isValid()) {
-    endDate = startDate.clone().add(15, 'minutes')
-  }
+const calculateNewDates = useMemoize(
+  ({
+    endDate,
+    startDate,
+    scheduleStart,
+    scheduleEnd,
+  }: {
+    endDate: dayjs.Dayjs
+    startDate: dayjs.Dayjs
+    scheduleStart: dayjs.Dayjs
+    scheduleEnd: dayjs.Dayjs
+  }) => {
+    // If there is no end date, we add 15 minutes to the start date and use that as the end date
+    if (!endDate.isValid()) {
+      endDate = startDate.clone().add(15, 'minutes')
+    }
 
-  // If the start date is before the opened date, we use the schedule start as the start date
-  // This is to ensure the generated style of the record is not outside the bounds of the calendar
-  if (startDate.isSameOrBefore(scheduleStart)) {
-    startDate = scheduleStart
-  }
+    // If the start date is before the opened date, we use the schedule start as the start date
+    // This is to ensure the generated style of the record is not outside the bounds of the calendar
+    if (startDate.isSameOrBefore(scheduleStart)) {
+      startDate = scheduleStart
+    }
 
-  // If the end date is after the schedule end, we use the schedule end as the end date
-  // This is to ensure the generated style of the record is not outside the bounds of the calendar
-  if (endDate.isAfter(scheduleEnd)) {
-    endDate = scheduleEnd
-  }
+    // If the end date is after the schedule end, we use the schedule end as the end date
+    // This is to ensure the generated style of the record is not outside the bounds of the calendar
+    if (endDate.isAfter(scheduleEnd)) {
+      endDate = scheduleEnd
+    }
 
-  return { endDate, startDate }
-}
+    return { endDate, startDate }
+  },
+)
 
 const getGridTime = (date: dayjs.Dayjs, round = false) => {
   const gridCalc = date.hour() * 60 + date.minute()
@@ -133,35 +142,14 @@ const hasSlotForRecord = (
 }
 const getMaxOverlaps = ({
   row,
-  gridTimeMap,
   columnArray,
+  graph,
 }: {
   row: Row
-  gridTimeMap: Map<
-    number,
-    {
-      count: number
-      id: string[]
-    }
-  >
   columnArray: Array<Array<Row>>
+  graph: Map<string, Set<string>>
 }) => {
   const visited: Set<string> = new Set()
-  const graph: Map<string, Set<string>> = new Map()
-
-  // Build the graph
-  for (const [_gridTime, { id: ids }] of gridTimeMap) {
-    for (const id1 of ids) {
-      if (!graph.has(id1)) {
-        graph.set(id1, new Set())
-      }
-      for (const id2 of ids) {
-        if (id1 !== id2) {
-          graph.get(id1)!.add(id2)
-        }
-      }
-    }
-  }
 
   const dfs = (id: string): number => {
     visited.add(id)
@@ -169,6 +157,7 @@ const getMaxOverlaps = ({
     const neighbors = graph.get(id)
     if (neighbors) {
       for (const neighbor of neighbors) {
+        if (maxOverlaps >= columnArray.length) return maxOverlaps
         if (!visited.has(neighbor)) {
           maxOverlaps = Math.min(Math.max(maxOverlaps, dfs(neighbor) + 1), columnArray.length)
         }
@@ -187,32 +176,19 @@ const getMaxOverlaps = ({
 
 const recordsAcrossAllRange = computed<{
   record: Row[]
-  count: {
-    [key: string]: {
+  gridTimeMap: Map<
+    number,
+    {
+      count: number
       id: string[]
-      overflow: boolean
-      overflowCount: number
     }
-  }
+  >
 }>(() => {
   if (!calendarRange.value || !formattedData.value) return { record: [], count: {} }
 
   const scheduleStart = dayjs(selectedDate.value).startOf('day')
   const scheduleEnd = dayjs(selectedDate.value).endOf('day')
 
-  // We use this object to keep track of the number of records that overlap at a given time, and if the number of records exceeds 4, we hide the record
-  // and show a button to view more records
-  // The key is the time in HH:mm format
-  // id is the id of the record generated below
-
-  const overlaps: {
-    [key: string]: {
-      id: string[]
-      overflow: boolean
-      overflowCount: number
-    }
-  } = {}
-
   const perRecordHeight = 52
 
   const columnArray: Array<Array<Row>> = [[]]
@@ -400,11 +376,28 @@ const recordsAcrossAllRange = computed<{
       record.rowMeta.overLapIteration = parseInt(columnIndex) + 1
     }
   }
+
+  const graph = new Map<string, Set<string>>()
+
+  // Build the graph
+  for (const [_gridTime, { id: ids }] of gridTimeMap) {
+    for (const id1 of ids) {
+      if (!graph.has(id1)) {
+        graph.set(id1, new Set())
+      }
+      for (const id2 of ids) {
+        if (id1 !== id2) {
+          graph.get(id1)!.add(id2)
+        }
+      }
+    }
+  }
+
   for (const record of recordsByRange) {
     const numberOfOverlaps = getMaxOverlaps({
       row: record,
-      gridTimeMap,
       columnArray,
+      graph,
     })
 
     record.rowMeta.numberOfOverlaps = numberOfOverlaps
@@ -418,24 +411,6 @@ const recordsAcrossAllRange = computed<{
 
       if (record.rowMeta.overLapIteration! - 1 > 7) {
         display = 'none'
-        gridTimeMap.forEach((value, key) => {
-          if (value.id.includes(record.rowMeta.id!)) {
-            if (!overlaps[key]) {
-              overlaps[key] = {
-                id: value.id,
-                overflow: true,
-                overflowCount: value.id.length,
-              }
-            } else {
-              overlaps[key].overflow = true
-              value.id.forEach((id) => {
-                if (!overlaps[key].id.includes(id)) {
-                  overlaps[key].id.push(id)
-                }
-              })
-            }
-          }
-        })
       } else {
         left = width * (record.rowMeta.overLapIteration! - 1)
       }
@@ -453,7 +428,7 @@ const recordsAcrossAllRange = computed<{
   }
 
   return {
-    count: overlaps,
+    gridTimeMap,
     record: recordsByRange,
   }
 })
@@ -477,7 +452,7 @@ const useDebouncedRowUpdate = useDebounceFn((row: Row, updateProperty: string[],
 }, 500)
 
 // When the user is dragging a record, we calculate the new start and end date based on the mouse position
-const calculateNewRow = (event: MouseEvent) => {
+const calculateNewRow = (event: MouseEvent, skipChangeCheck?: boolean) => {
   if (!container.value || !dragRecord.value) return { newRow: null, updateProperty: [] }
 
   const { top } = container.value.getBoundingClientRect()
@@ -505,7 +480,7 @@ const calculateNewRow = (event: MouseEvent) => {
     ...dragRecord.value,
     row: {
       ...dragRecord.value.row,
-      [fromCol.title!]: dayjs(newStartDate).format('YYYY-MM-DD HH:mm:ssZ'),
+      [fromCol.title!]: dayjs(newStartDate).utc().format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
 
@@ -528,11 +503,16 @@ const calculateNewRow = (event: MouseEvent) => {
       endDate = newStartDate.clone()
     }
 
-    newRow.row[toCol.title!] = dayjs(endDate).format('YYYY-MM-DD HH:mm:ssZ')
+    newRow.row[toCol.title!] = dayjs(endDate).utc().format('YYYY-MM-DD HH:mm:ssZ')
 
     updateProperty.push(toCol.title!)
   }
 
+  // If from and to columns of the dragRecord and the newRow are the same, we don't manipulate the formattedRecords and formattedSideBarData. This removes unwanted computation
+  if (dragRecord.value.row[fromCol.title!] === newRow.row[fromCol.title!] && !skipChangeCheck) {
+    return { newRow: null, updateProperty: [] }
+  }
+
   if (!newRow) {
     return { newRow: null, updateProperty: [] }
   }
@@ -552,6 +532,11 @@ const calculateNewRow = (event: MouseEvent) => {
       const pk = extractPkFromRow(r.row, meta.value!.columns!)
       return pk !== newPk
     })
+
+    dragRecord.value = {
+      ...dragRecord.value,
+      row: newRow.row,
+    }
   }
   return { newRow, updateProperty }
 }
@@ -668,7 +653,7 @@ const stopDrag = (event: MouseEvent) => {
   clearTimeout(dragTimeout.value!)
   if (!isUIAllowed('dataEdit') || !isDragging.value || !container.value || !dragRecord.value) return
 
-  const { newRow, updateProperty } = calculateNewRow(event)
+  const { newRow, updateProperty } = calculateNewRow(event, true)
   if (!newRow && !updateProperty) return
 
   const allRecords = document.querySelectorAll('.draggable-record')
@@ -823,32 +808,18 @@ const dropEvent = (event: DragEvent) => {
 }
 
 const isOverflowAcrossHourRange = (hour: dayjs.Dayjs) => {
-  let startOfHour = hour.startOf('hour')
-  const endOfHour = hour.endOf('hour')
-
-  const ids: Array<string> = []
-
-  let isOverflow = false
+  if (!recordsAcrossAllRange.value || !recordsAcrossAllRange.value.gridTimeMap) return { isOverflow: false, overflowCount: 0 }
+  const { gridTimeMap } = recordsAcrossAllRange.value
+  const startMinute = hour.hour() * 60 + hour.minute()
+  const endMinute = hour.hour() * 60 + hour.minute() + 59
   let overflowCount = 0
 
-  while (startOfHour.isBefore(endOfHour, 'minute')) {
-    const hourKey = startOfHour.hour() * 60 + startOfHour.minute()
-    if (recordsAcrossAllRange.value?.count?.[hourKey]?.overflow) {
-      isOverflow = true
-
-      recordsAcrossAllRange.value?.count?.[hourKey]?.id.forEach((id) => {
-        if (!ids.includes(id)) {
-          ids.push(id)
-          overflowCount += 1
-        }
-      })
-    }
-    startOfHour = startOfHour.add(1, 'minute')
+  for (let minute = startMinute; minute <= endMinute; minute++) {
+    const recordCount = gridTimeMap.get(minute)?.count ?? 0
+    overflowCount = Math.max(overflowCount, recordCount)
   }
 
-  overflowCount = overflowCount > 8 ? overflowCount - 8 : 0
-
-  return { isOverflow, overflowCount }
+  return { isOverflow: overflowCount - 8 > 0, overflowCount: overflowCount - 8 }
 }
 
 const viewMore = (hour: dayjs.Dayjs) => {
diff --git a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
index d7b140a463..cc06aacbb3 100644
--- a/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/MonthView.vue
@@ -64,15 +64,22 @@ const fields = inject(FieldsInj, ref())
 
 const { fields: _fields } = useViewColumnsOrThrow()
 
-const getFieldStyle = (field: ColumnType | undefined) => {
-  if (!field) return { underline: false, bold: false, italic: false }
-  const fi = _fields.value?.find((f) => f.title === field.title)
+const fieldStyles = computed(() => {
+  if (!_fields.value) return new Map()
+  return new Map(
+    _fields.value.map((field) => [
+      field.fk_column_id,
+      {
+        underline: field.underline,
+        bold: field.bold,
+        italic: field.italic,
+      },
+    ]),
+  )
+})
 
-  return {
-    underline: fi?.underline,
-    bold: fi?.bold,
-    italic: fi?.italic,
-  }
+const getFieldStyle = (field: ColumnType) => {
+  return fieldStyles.value.get(field.id)
 }
 
 const dates = computed(() => {
@@ -343,7 +350,7 @@ const recordsToDisplay = computed<{
   }
 })
 
-const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean) => {
+const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean, skipChangeCheck?: boolean) => {
   const { top, height, width, left } = calendarGridContainer.value.getBoundingClientRect()
 
   const percentY = (event.clientY - top - window.scrollY) / height
@@ -364,7 +371,7 @@ const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean) => {
     ...dragRecord.value,
     row: {
       ...dragRecord.value?.row,
-      [fromCol!.title!]: dayjs(newStartDate).format('YYYY-MM-DD HH:mm:ssZ'),
+      [fromCol!.title!]: dayjs(newStartDate).utc().format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
 
@@ -384,10 +391,15 @@ const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean) => {
       endDate = newStartDate.clone()
     }
 
-    newRow.row[toCol!.title!] = dayjs(endDate).format('YYYY-MM-DD HH:mm:ssZ')
+    newRow.row[toCol!.title!] = dayjs(endDate).utc().format('YYYY-MM-DD HH:mm:ssZ')
     updateProperty.push(toCol!.title!)
   }
 
+  // If from and to columns of the dragRecord and the newRow are the same, we don't manipulate the formattedRecords and formattedSideBarData. This removes unwanted computation
+  if (dragRecord.value.row[fromCol.title!] === newRow.row[fromCol.title!] && !skipChangeCheck) {
+    return { newRow: null, updatedProperty: [] }
+  }
+
   if (!newRow) return { newRow: null, updateProperty: [] }
 
   const newPk = extractPkFromRow(newRow.row, meta.value!.columns!)
@@ -515,7 +527,7 @@ const stopDrag = (event: MouseEvent) => {
   event.preventDefault()
   dragElement.value!.style.boxShadow = 'none'
 
-  const { newRow, updateProperty } = calculateNewRow(event, false)
+  const { newRow, updateProperty } = calculateNewRow(event, false, true)
 
   const allRecords = document.querySelectorAll('.draggable-record')
   allRecords.forEach((el) => {
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
index b11d9c6938..f346923cbe 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import dayjs from 'dayjs'
-import { type ColumnType } from 'nocodb-sdk'
+import type { ColumnType } from 'nocodb-sdk'
 import type { Row } from '~/lib'
 import { computed, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
@@ -22,14 +22,22 @@ const fields = inject(FieldsInj, ref())
 
 const { fields: _fields } = useViewColumnsOrThrow()
 
-const getFieldStyle = (field: ColumnType | undefined) => {
-  const fi = _fields.value?.find((f) => f.title === field?.title)
+const fieldStyles = computed(() => {
+  if (!_fields.value) return new Map()
+  return new Map(
+    _fields.value.map((field) => [
+      field.fk_column_id,
+      {
+        underline: field.underline,
+        bold: field.bold,
+        italic: field.italic,
+      },
+    ]),
+  )
+})
 
-  return {
-    underline: fi?.underline,
-    bold: fi?.bold,
-    italic: fi?.italic,
-  }
+const getFieldStyle = (field: ColumnType) => {
+  return fieldStyles.value.get(field.id)
 }
 
 // Calculate the dates of the week
@@ -71,6 +79,18 @@ const findFirstSuitableRow = (recordsInDay: any, startDayIndex: number, spanDays
   }
 }
 
+const isInRange = (date: dayjs.Dayjs) => {
+  return (
+    date &&
+    date.isBetween(
+      dayjs(selectedDateRange.value.start).startOf('day'),
+      dayjs(selectedDateRange.value.end).endOf('day'),
+      'day',
+      '[]',
+    )
+  )
+}
+
 const calendarData = computed(() => {
   if (!formattedData.value || !calendarRange.value) return []
 
@@ -156,9 +176,8 @@ const calendarData = computed(() => {
 
         let position = 'none'
 
-        const isStartInRange =
-          ogStartDate && ogStartDate.isBetween(selectedDateRange.value.start, selectedDateRange.value.end, 'day', '[]')
-        const isEndInRange = endDate && endDate.isBetween(selectedDateRange.value.start, selectedDateRange.value.end, 'day', '[]')
+        const isStartInRange = isInRange(ogStartDate)
+        const isEndInRange = isInRange(endDate)
 
         // Calculate the position of the record in the calendar based on the start and end date
         // The position can be 'none', 'leftRounded', 'rightRounded', 'rounded'
diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
index df33ccb3ed..a195ad3c1f 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 import dayjs from 'dayjs'
-import { type ColumnType } from 'nocodb-sdk'
+import type { ColumnType } from 'nocodb-sdk'
 import type { Row } from '~/lib'
-import { computed, ref, useViewColumnsOrThrow } from '#imports'
+import { computed, ref, useMemoize, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
 const emits = defineEmits(['expandRecord', 'newRecord'])
@@ -14,7 +14,6 @@ const {
   calendarRange,
   displayField,
   selectedTime,
-  selectedDate,
   updateRowProperty,
   sideBarFilterOption,
   showSideMenu,
@@ -34,16 +33,53 @@ const fields = inject(FieldsInj, ref())
 
 const { fields: _fields } = useViewColumnsOrThrow()
 
-const getFieldStyle = (field: ColumnType | undefined) => {
-  if (!field) return { underline: false, bold: false, italic: false }
-  const fi = _fields.value?.find((f) => f.title === field.title)
+const fieldStyles = computed(() => {
+  if (!_fields.value) return new Map()
+  return new Map(
+    _fields.value.map((field) => [
+      field.fk_column_id,
+      {
+        underline: field.underline,
+        bold: field.bold,
+        italic: field.italic,
+      },
+    ]),
+  )
+})
 
-  return {
-    underline: fi?.underline,
-    bold: fi?.bold,
-    italic: fi?.italic,
-  }
+const getFieldStyle = (field: ColumnType) => {
+  return fieldStyles.value.get(field.id)
 }
+const calculateNewDates = useMemoize(
+  ({
+    startDate,
+    endDate,
+    scheduleStart,
+    scheduleEnd,
+  }: {
+    startDate: dayjs.Dayjs
+    endDate: dayjs.Dayjs
+    scheduleStart: dayjs.Dayjs
+    scheduleEnd: dayjs.Dayjs
+  }) => {
+    // If the end date is not valid, we set it to 15 minutes after the start date
+    if (!endDate?.isValid()) {
+      endDate = startDate.clone().add(15, 'minutes')
+    }
+
+    // If the start date is before the start of the schedule, we set it to the start of the schedule
+    // If the end date is after the end of the schedule, we set it to the end of the schedule
+    // This is to ensure that the records are within the bounds of the schedule and do not overflow
+    if (startDate.isBefore(scheduleStart, 'minutes')) {
+      startDate = scheduleStart.clone()
+    }
+    if (endDate.isAfter(scheduleEnd, 'minutes')) {
+      endDate = scheduleEnd.clone()
+    }
+
+    return { startDate, endDate }
+  },
+)
 
 // Since it is a datetime Week view, we need to create a 2D array of dayjs objects to represent the hours in a day for each day in the week
 const datesHours = computed(() => {
@@ -71,22 +107,122 @@ const datesHours = computed(() => {
   return datesHours
 })
 
-const recordsAcrossAllRange = computed<{
-  records: Array<Row>
-  count: {
-    [key: string]: {
-      [key: string]: {
-        id: Array<string>
-        overflow: boolean
-        overflowCount: number
+const getDayIndex = (date: dayjs.Dayjs) => {
+  let dayIndex = date.day() - 1
+  if (dayIndex === -1) {
+    dayIndex = 6
+  }
+  return dayIndex
+}
+
+const getGridTime = (date: dayjs.Dayjs, round = false) => {
+  const gridCalc = date.hour() * 60 + date.minute()
+  if (round) {
+    return Math.ceil(gridCalc)
+  } else {
+    return Math.floor(gridCalc)
+  }
+}
+
+const getGridTimeSlots = (from: dayjs.Dayjs, to: dayjs.Dayjs) => {
+  return {
+    from: getGridTime(from, false),
+    to: getGridTime(to, true) - 1,
+    dayIndex: getDayIndex(from),
+  }
+}
+
+const hasSlotForRecord = (
+  columnArray: Row[],
+  dates: {
+    fromDate: dayjs.Dayjs
+    toDate: dayjs.Dayjs
+  },
+) => {
+  const { fromDate, toDate } = dates
+
+  if (!fromDate || !toDate) return false
+
+  for (const column of columnArray) {
+    const columnFromCol = column.rowMeta.range?.fk_from_col
+    const columnToCol = column.rowMeta.range?.fk_to_col
+
+    if (!columnFromCol) return false
+
+    const { startDate: columnFromDate, endDate: columnToDate } = calculateNewDates({
+      startDate: dayjs(column.row[columnFromCol.title!]),
+      endDate: columnToCol
+        ? dayjs(column.row[columnToCol.title!])
+        : dayjs(column.row[columnFromCol.title!]).add(1, 'hour').subtract(1, 'minute'),
+      scheduleStart: dayjs(selectedDateRange.value.start).startOf('day'),
+      scheduleEnd: dayjs(selectedDateRange.value.end).endOf('day'),
+    })
+
+    if (
+      fromDate.isBetween(columnFromDate, columnToDate, null, '[]') ||
+      toDate.isBetween(columnFromDate, columnToDate, null, '[]')
+    ) {
+      return false
+    }
+  }
+  return true
+}
+
+const getMaxOverlaps = ({
+  row,
+  columnArray,
+  graph,
+}: {
+  row: Row
+  columnArray: Array<Array<Array<Row>>>
+  graph: Map<string, Set<string>>
+}) => {
+  const id = row.rowMeta.id as string
+
+  const visited: Set<string> = new Set()
+
+  const dayIndex = row.rowMeta.dayIndex
+  const overlapIndex = columnArray[dayIndex].findIndex((column) => column.findIndex((r) => r.rowMeta.id === id) !== -1) + 1
+
+  const dfs = (id: string): number => {
+    visited.add(id)
+    let maxOverlaps = 1
+    const neighbors = graph.get(id)
+    if (neighbors) {
+      for (const neighbor of neighbors) {
+        if (maxOverlaps >= columnArray[dayIndex].length) return maxOverlaps
+        if (!visited.has(neighbor)) {
+          maxOverlaps = Math.min(Math.max(maxOverlaps, dfs(neighbor) + 1), columnArray[dayIndex].length)
+        }
       }
     }
+    return maxOverlaps
+  }
+
+  let maxOverlaps = 1
+  if (graph.has(id)) {
+    maxOverlaps = dfs(id)
   }
+  return { maxOverlaps, dayIndex, overlapIndex }
+}
+
+const recordsAcrossAllRange = computed<{
+  records: Array<Row>
+  gridTimeMap: Map<
+    number,
+    Map<
+      number,
+      {
+        count: number
+        id: string[]
+      }
+    >
+  >
 }>(() => {
   if (!formattedData.value || !calendarRange.value || !container.value || !scrollContainer.value)
     return {
       records: [],
-      count: {},
+      gridTimeMap: new Map(),
     }
   const perWidth = containerWidth.value / 7
   const perHeight = 52
@@ -94,20 +230,18 @@ const recordsAcrossAllRange = computed<{
   const scheduleStart = dayjs(selectedDateRange.value.start).startOf('day')
   const scheduleEnd = dayjs(selectedDateRange.value.end).endOf('day')
 
-  // We need to keep track of the overlaps for each day and hour, minute in the week to calculate the width and left position of each record
-  // The first key is the date, the second key is the hour, and the value is an object containing the ids of the records that overlap
-  // The key is in the format YYYY-MM-DD and the hour is in the format HH:mm
-  const overlaps: {
-    [key: string]: {
-      [key: string]: {
-        id: Array<string>
-        overflow: boolean
-        overflowCount: number
+  const columnArray: Array<Array<Array<Row>>> = [[[]]]
+  const gridTimeMap = new Map<
+    number,
+    Map<
+      number,
+      {
+        count: number
+        id: string[]
       }
-    }
-  } = {}
-
-  let recordsToDisplay: Array<Row> = []
+    >
+  >()
+  const recordsToDisplay: Array<Row> = []
 
   calendarRange.value.forEach((range) => {
     const fromCol = range.fk_from_col
@@ -115,123 +249,36 @@ const recordsAcrossAllRange = computed<{
 
     // We fetch all the records that match the calendar ranges in a single time.
     // But not all fetched records are valid for the certain range, so we filter them out & sort them
-    const sortedFormattedData = [...formattedData.value].filter((record) => {
-      const fromDate = record.row[fromCol!.title!] ? dayjs(record.row[fromCol!.title!]) : null
+    const sortedFormattedData = [...formattedData.value]
+      .filter((record) => {
+        const fromDate = record.row[fromCol!.title!] ? dayjs(record.row[fromCol!.title!]) : null
 
-      if (fromCol && toCol) {
-        const fromDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
-        const toDate = record.row[toCol.title!] ? dayjs(record.row[toCol.title!]) : null
-
-        return fromDate && toDate && !toDate.isBefore(fromDate)
-      } else if (fromCol && !toCol) {
-        return !!fromDate
-      }
-      return false
-    })
-
-    sortedFormattedData.forEach((record: Row) => {
-      if (!toCol && fromCol) {
-        // If there is no toColumn chosen in the range
-        const ogStartDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
-        if (!ogStartDate) return
-
-        let endDate = ogStartDate.clone().add(1, 'hour')
-
-        if (endDate.isAfter(scheduleEnd, 'minutes')) {
-          endDate = scheduleEnd
-        }
-
-        const id = record.rowMeta.id ?? generateRandomNumber()
-
-        let startDate = ogStartDate.clone()
-
-        let style: Partial<CSSStyleDeclaration> = {}
-
-        while (startDate.isBefore(endDate, 'minutes')) {
-          const dateKey = startDate?.format('YYYY-MM-DD')
-          const hourKey = startDate?.format('HH:mm')
-
-          // If the dateKey and hourKey are valid, we add the id to the overlaps object
-          if (dateKey && hourKey) {
-            if (!overlaps[dateKey]) {
-              overlaps[dateKey] = {}
-            }
-            if (!overlaps[dateKey][hourKey]) {
-              overlaps[dateKey][hourKey] = {
-                id: [],
-                overflow: false,
-                overflowCount: 0,
-              }
-            }
-            overlaps[dateKey][hourKey].id.push(id)
-          }
-
-          // If the number of records that overlap in a single hour is more than 4, we hide the record and set the overflow flag to true
-          // We also keep track of the number of records that overflow
-          if (overlaps[dateKey][hourKey].id.length > 4) {
-            overlaps[dateKey][hourKey].overflow = true
-            style.display = 'none'
-            overlaps[dateKey][hourKey].overflowCount += 1
-          }
-
-          // TODO: dayIndex is not calculated perfectly
-          // Should revisit this part in next iteration
-          let dayIndex = dayjs(dateKey).day() - 1
-          if (dayIndex === -1) {
-            dayIndex = 6
-          }
+        if (fromCol && toCol) {
+          const fromDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
+          const toDate = record.row[toCol.title!] ? dayjs(record.row[toCol.title!]) : null
 
-          startDate = startDate.add(1, 'minute')
+          return fromDate && toDate && !toDate.isBefore(fromDate)
+        } else if (fromCol && !toCol) {
+          return !!fromDate
         }
+        return false
+      })
+      .sort((a, b) => {
+        const aDate = dayjs(a.row[fromCol!.title!])
+        const bDate = dayjs(b.row[fromCol!.title!])
+        return aDate.isBefore(bDate) ? 1 : -1
+      })
 
-        let dayIndex = ogStartDate.day() - 1
-
-        if (dayIndex === -1) {
-          dayIndex = 6
-        }
-
-        const minutes = (ogStartDate.minute() / 60 + ogStartDate.hour()) * 52
-
-        style = {
-          ...style,
-          top: `${minutes + 1}px`,
-          height: `${perHeight - 2}px`,
-        }
+    for (const record of sortedFormattedData) {
+      const id = record.rowMeta.id ?? generateRandomNumber()
 
-        recordsToDisplay.push({
-          ...record,
-          rowMeta: {
-            ...record.rowMeta,
-            id,
-            position: 'rounded',
-            style,
-            range,
-            dayIndex,
-          },
+      if (fromCol && toCol) {
+        const { startDate, endDate } = calculateNewDates({
+          startDate: dayjs(record.row[fromCol.title!]),
+          endDate: dayjs(record.row[toCol.title!]),
+          scheduleStart,
+          scheduleEnd,
         })
-      } else if (fromCol && toCol) {
-        const id = record.rowMeta.id ?? generateRandomNumber()
-
-        let startDate = record.row[fromCol.title!] ? dayjs(record.row[fromCol.title!]) : null
-        let endDate = record.row[toCol.title!] ? dayjs(record.row[toCol.title!]) : null
-
-        // If the start date is not valid, we skip the record
-        if (!startDate?.isValid()) return
-
-        // If the end date is not valid, we set it to 30 minutes after the start date
-        if (!endDate?.isValid()) {
-          endDate = startDate.clone().add(30, 'minutes')
-        }
-
-        // If the start date is before the start of the schedule, we set it to the start of the schedule
-        // If the end date is after the end of the schedule, we set it to the end of the schedule
-        // This is to ensure that the records are within the bounds of the schedule and do not overflow
-        if (startDate.isBefore(scheduleStart, 'minutes')) {
-          startDate = scheduleStart
-        }
-        if (endDate.isAfter(scheduleEnd, 'minutes')) {
-          endDate = scheduleEnd
-        }
 
         // Setting the current start date to the start date of the record
         let currentStartDate: dayjs.Dayjs = startDate.clone()
@@ -242,14 +289,7 @@ const recordsAcrossAllRange = computed<{
           const recordStart: dayjs.Dayjs = currentEndDate.isSame(startDate, 'day') ? startDate : currentStartDate
           const recordEnd = currentEndDate.isSame(endDate, 'day') ? endDate : currentEndDate
 
-          const dateKey = recordStart.format('YYYY-MM-DD')
-
-          // TODO: dayIndex is not calculated perfectly
-          // Should revisit this part in next iteration
-          let dayIndex = recordStart.day() - 1
-          if (dayIndex === -1) {
-            dayIndex = 6
-          }
+          const dayIndex = getDayIndex(recordStart)
 
           // We calculate the index of the start and end hour in the day
           const startHourIndex = Math.max(
@@ -278,36 +318,8 @@ const recordsAcrossAllRange = computed<{
             position = 'none'
           }
 
-          let _startHourIndex = startHourIndex
-
           let style: Partial<CSSStyleDeclaration> = {}
 
-          // We loop through the start hour index to the end hour index and add the id to the overlaps object
-          while (_startHourIndex <= endHourIndex) {
-            const hourKey = datesHours.value[dayIndex][_startHourIndex].format('HH:mm')
-            if (!overlaps[dateKey]) {
-              overlaps[dateKey] = {}
-            }
-            if (!overlaps[dateKey][hourKey]) {
-              overlaps[dateKey][hourKey] = {
-                id: [],
-                overflow: false,
-                overflowCount: 0,
-              }
-            }
-            overlaps[dateKey][hourKey].id.push(id)
-
-            // If the number of records that overlap in a single hour is more than 4, we hide the record and set the overflow flag to true
-            // We also keep track of the number of records that overflow
-            if (overlaps[dateKey][hourKey].id.length > 4) {
-              overlaps[dateKey][hourKey].overflow = true
-              style.display = 'none'
-              overlaps[dateKey][hourKey].overflowCount += 1
-            }
-
-            _startHourIndex++
-          }
-
           const spanHours = endHourIndex - startHourIndex + 1
 
           const top = startHourIndex * perHeight
@@ -334,45 +346,170 @@ const recordsAcrossAllRange = computed<{
           // We set the current start date to the next day
           currentStartDate = currentStartDate.add(1, 'day').hour(0).minute(0)
         }
+      } else if (fromCol) {
+        // If there is no toColumn chosen in the range
+        const { startDate } = calculateNewDates({
+          startDate: dayjs(record.row[fromCol.title!]),
+          endDate: dayjs(record.row[fromCol.title!]).add(1, 'hour').subtract(1, 'minute'),
+          scheduleStart,
+          scheduleEnd,
+        })
+
+        let style: Partial<CSSStyleDeclaration> = {}
+
+        const dayIndex = getDayIndex(startDate)
+
+        const minutes = (startDate.minute() / 60 + startDate.hour()) * perHeight
+
+        style = {
+          ...style,
+          top: `${minutes + 1}px`,
+          height: `${perHeight - 2}px`,
+        }
+
+        recordsToDisplay.push({
+          ...record,
+          rowMeta: {
+            ...record.rowMeta,
+            id,
+            position: 'rounded',
+            style,
+            range,
+            dayIndex,
+          },
+        })
       }
+    }
+
+    recordsToDisplay.sort((a, b) => {
+      const fromColA = a.rowMeta.range?.fk_from_col
+      const fromColB = b.rowMeta.range?.fk_from_col
+      if (!fromColA || !fromColB) return 0
+      return dayjs(a.row[fromColA.title!]).isBefore(dayjs(b.row[fromColB.title!])) ? -1 : 1
     })
 
-    // With can't find the left and width of the record without knowing the overlaps
-    // Hence the first iteration is to find the overlaps, top, height and then the second iteration is to find the left and width
-    // This is because the left and width of the record depends on the overlaps
-
-    recordsToDisplay = recordsToDisplay.map((record) => {
-      // maxOverlaps is the maximum number of records that overlap in a single hour
-      // overlapIndex is the index of the record in the overlaps object
-      let maxOverlaps = 1
-      let overlapIndex = 0
-      const dayIndex = record.rowMeta.dayIndex as number
-
-      const dateKey = dayjs(selectedDateRange.value.start).add(dayIndex, 'day').format('YYYY-MM-DD')
-      for (const hours in overlaps[dateKey]) {
-        // We are checking if the overlaps object contains the id of the record
-        // If it does, we set the maxOverlaps and overlapIndex
-        if (overlaps[dateKey][hours].id.includes(record.rowMeta.id!)) {
-          maxOverlaps = Math.max(maxOverlaps, overlaps[dateKey][hours].id.length - overlaps[dateKey][hours].overflowCount)
-          overlapIndex = Math.max(overlapIndex, overlaps[dateKey][hours].id.indexOf(record.rowMeta.id!))
+    for (const record of recordsToDisplay) {
+      const fromCol = record.rowMeta.range?.fk_from_col
+      const toCol = record.rowMeta.range?.fk_to_col
+
+      if (!fromCol) continue
+      const { startDate, endDate } = calculateNewDates({
+        startDate: dayjs(record.row[fromCol.title!]),
+        endDate: toCol ? dayjs(record.row[toCol.title!]) : dayjs(record.row[fromCol.title!]).add(1, 'hour').subtract(1, 'minute'),
+        scheduleStart,
+        scheduleEnd,
+      })
+
+      const gridTimes = getGridTimeSlots(startDate, endDate)
+
+      const dayIndex = record.rowMeta.dayIndex ?? gridTimes.dayIndex
+
+      for (let gridCounter = gridTimes.from; gridCounter <= gridTimes.to; gridCounter++) {
+        if (!gridTimeMap.has(dayIndex)) {
+          gridTimeMap.set(
+            dayIndex,
+            new Map<
+              number,
+              {
+                count: number
+                id: string[]
+              }
+            >(),
+          )
+        }
+
+        if (!gridTimeMap.get(dayIndex)?.has(gridCounter)) {
+          gridTimeMap.set(dayIndex, (gridTimeMap.get(dayIndex) ?? new Map()).set(gridCounter, { count: 0, id: [] }))
+        }
+
+        const idArray = gridTimeMap.get(dayIndex)!.get(gridCounter)!.id
+        idArray.push(record.rowMeta.id!)
+        const count = gridTimeMap.get(dayIndex)!.get(gridCounter)!.count + 1
+
+        gridTimeMap.set(dayIndex, (gridTimeMap.get(dayIndex) ?? new Map()).set(gridCounter, { count, id: idArray }))
+      }
+
+      let foundAColumn = false
+
+      if (!columnArray[dayIndex]) {
+        columnArray[dayIndex] = []
+      }
+
+      for (const column in columnArray[dayIndex]) {
+        if (hasSlotForRecord(columnArray[dayIndex][column], { fromDate: startDate, toDate: endDate })) {
+          columnArray[dayIndex][column].push(record)
+          foundAColumn = true
+          break
+        }
+      }
+
+      if (!foundAColumn) {
+        columnArray[dayIndex].push([record])
+      }
+    }
+
+    const graph: Map<number, Map<string, Set<string>>> = new Map()
+
+    for (const dayIndex of gridTimeMap.keys()) {
+      if (!graph.has(dayIndex)) {
+        graph.set(dayIndex, new Map())
+      }
+      for (const [_gridTime, { id: ids }] of gridTimeMap.get(dayIndex)) {
+        for (const id1 of ids) {
+          if (!graph.get(dayIndex).has(id1)) {
+            graph.get(dayIndex).set(id1, new Set())
+          }
+          for (const id2 of ids) {
+            if (id1 !== id2) {
+              if (!graph.get(dayIndex).get(id1).has(id2)) {
+                graph.get(dayIndex).get(id1).add(id2)
+              }
+            }
+          }
+        }
+      }
+    }
+
+    for (const dayIndex in columnArray) {
+      for (const columnIndex in columnArray[dayIndex]) {
+        for (const record of columnArray[dayIndex][columnIndex]) {
+          record.rowMeta.overLapIteration = parseInt(columnIndex) + 1
         }
       }
-      const spacing = 0.1
-      const widthPerRecord = (100 - spacing * (maxOverlaps - 1)) / maxOverlaps / 7
-      const leftPerRecord = widthPerRecord * overlapIndex
+    }
+    for (const record of recordsToDisplay) {
+      const { maxOverlaps, overlapIndex } = getMaxOverlaps({
+        row: record,
+        columnArray,
+        graph: graph.get(record.rowMeta.dayIndex!) ?? new Map(),
+      })
+
+      const dayIndex = record.rowMeta.dayIndex ?? tDayIndex
+      record.rowMeta.numberOfOverlaps = maxOverlaps
 
+      let width = 0
+      let left = 100
+      const majorLeft = dayIndex * perWidth
+      let display = 'block'
+
+      if (record.rowMeta.overLapIteration! - 1 > 2) {
+        display = 'none'
+      } else {
+        width = 100 / Math.min(maxOverlaps, 3) / 7
+        left = width * (overlapIndex - 1)
+      }
       record.rowMeta.style = {
         ...record.rowMeta.style,
-        left: `calc(${dayIndex * perWidth}px + ${leftPerRecord}% )`,
-        width: `calc(${widthPerRecord - 0.1}%)`,
+        left: `calc(${majorLeft}px + ${left}%)`,
+        width: `calc(${width}%)`,
+        display,
       }
-      return record
-    })
+    }
   })
 
   return {
     records: recordsToDisplay,
-    count: overlaps,
+    gridTimeMap,
   }
 })
 
@@ -497,9 +634,11 @@ const onResizeStart = (direction: 'right' | 'left', event: MouseEvent, record: R
 const calculateNewRow = (
   event: MouseEvent,
   updateSideBar?: boolean,
+  skipChangeCheck?: boolean,
 ): {
   newRow: Row | null
   updatedProperty: string[]
+  skipChangeCheck?: boolean
 } => {
   const { width, left, top } = container.value.getBoundingClientRect()
 
@@ -528,7 +667,7 @@ const calculateNewRow = (
     ...dragRecord.value,
     row: {
       ...dragRecord.value.row,
-      [fromCol.title!]: dayjs(newStartDate).format('YYYY-MM-DD HH:mm:ssZ'),
+      [fromCol.title!]: dayjs(newStartDate).utc().format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
 
@@ -546,11 +685,16 @@ const calculateNewRow = (
       endDate = newStartDate.clone()
     }
 
-    newRow.row[toCol.title!] = dayjs(endDate).format('YYYY-MM-DD HH:mm:ssZ')
+    newRow.row[toCol.title!] = dayjs(endDate).utc().format('YYYY-MM-DD HH:mm:ssZ')
     updatedProperty.push(toCol.title!)
   }
 
-  if (!newRow) return { newRow: null, updatedProperty }
+  // If from and to columns of the dragRecord and the newRow are the same, we don't manipulate the formattedRecords and formattedSideBarData. This removes unwanted computation
+  if (dragRecord.value.row[fromCol.title!] === newRow.row[fromCol.title!] && !skipChangeCheck) {
+    return { newRow: null, updatedProperty: [] }
+  }
+
+  if (!newRow) return { newRow: null, updatedProperty: [] }
 
   const newPk = extractPkFromRow(newRow.row, meta.value!.columns!)
 
@@ -565,6 +709,10 @@ const calculateNewRow = (
       const pk = extractPkFromRow(r.row, meta.value!.columns!)
       return pk === newPk ? newRow : r
     })
+    dragRecord.value = {
+      ...dragRecord.value,
+      row: newRow.row,
+    }
   }
 
   return { newRow, updatedProperty }
@@ -591,7 +739,7 @@ const stopDrag = (event: MouseEvent) => {
   event.preventDefault()
   clearTimeout(dragTimeout.value!)
 
-  const { newRow, updatedProperty } = calculateNewRow(event, false)
+  const { newRow, updatedProperty } = calculateNewRow(event, false, true)
 
   // We set the visibility and opacity of the records back to normal
   const allRecords = document.querySelectorAll('.draggable-record')
@@ -676,33 +824,19 @@ const viewMore = (hour: dayjs.Dayjs) => {
 }
 
 const isOverflowAcrossHourRange = (hour: dayjs.Dayjs) => {
-  let startOfHour = hour.startOf('hour')
-  const endOfHour = hour.endOf('hour')
-
-  const ids: Array<string> = []
-
-  let isOverflow = false
+  if (!recordsAcrossAllRange.value || !recordsAcrossAllRange.value.gridTimeMap) return { isOverflow: false, overflowCount: 0 }
+  const { gridTimeMap } = recordsAcrossAllRange.value
+  const dayIndex = getDayIndex(hour)
+  const startMinute = hour.hour() * 60 + hour.minute()
+  const endMinute = hour.hour() * 60 + hour.minute() + 59
   let overflowCount = 0
 
-  while (startOfHour.isBefore(endOfHour, 'minute')) {
-    const dateKey = startOfHour.format('YYYY-MM-DD')
-    const hourKey = startOfHour.format('HH:mm')
-    if (recordsAcrossAllRange.value?.count?.[dateKey]?.[hourKey]?.overflow) {
-      isOverflow = true
-
-      recordsAcrossAllRange.value?.count?.[dateKey]?.[hourKey]?.id.forEach((id) => {
-        if (!ids.includes(id)) {
-          ids.push(id)
-          overflowCount += 1
-        }
-      })
-    }
-    startOfHour = startOfHour.add(1, 'minute')
+  for (let minute = startMinute; minute <= endMinute; minute++) {
+    const recordCount = gridTimeMap.get(dayIndex)?.get(minute)?.count ?? 0
+    overflowCount = Math.max(overflowCount, recordCount)
   }
 
-  overflowCount = overflowCount > 4 ? overflowCount - 4 : 0
-
-  return { isOverflow, overflowCount }
+  return { isOverflow: overflowCount - 3 > 0, overflowCount: overflowCount - 3 }
 }
 
 // TODO: Add Support for multiple ranges when multiple ranges are supported
@@ -773,7 +907,6 @@ watch(
           @click="
             () => {
               selectedTime = hour
-              selectedDate = hour
               dragRecord = undefined
             }
           "
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 69a95e043f..b75675b07d 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -261,8 +261,8 @@ const onClickAudit = () => {
                   {{ log.description.substring(log.description.indexOf(':') + 1) }}
                 </div>
                 <div v-if="log.id === editLog?.id" class="flex justify-end gap-1">
-                  <NcButton type="secondary" size="sm" @click="onCancel"> Cancel </NcButton>
-                  <NcButton v-e="['a:row-expand:comment:save']" size="sm" @click="onEditComment"> Save </NcButton>
+                  <NcButton size="small" type="secondary" @click="onCancel"> Cancel </NcButton>
+                  <NcButton v-e="['a:row-expand:comment:save']" size="small" @click="onEditComment"> Save </NcButton>
                 </div>
               </div>
             </div>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 672c836a20..56257e3798 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -51,6 +51,7 @@ interface Props {
   lastRow?: boolean
   closeAfterSave?: boolean
   newRecordHeader?: string
+  skipReload?: boolean
 }
 
 const props = defineProps<Props>()
@@ -102,7 +103,7 @@ const expandedFormScrollWrapper = ref()
 
 const reloadTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
-const reloadViewDataTrigger = inject(ReloadViewDataHookInj)
+const reloadViewDataTrigger = inject(ReloadViewDataHookInj, createEventHook())
 
 const { addOrEditStackRow } = useKanbanViewStoreOrThrow()
 
@@ -137,6 +138,8 @@ provide(MetaInj, meta)
 
 const isLoading = ref(true)
 
+const isSaving = ref(false)
+
 const {
   commentsDrawer,
   changedColumns,
@@ -207,26 +210,31 @@ const onDuplicateRow = () => {
 }
 
 const save = async () => {
+  isSaving.value = true
+
   let kanbanClbk
   if (activeView.value?.type === ViewTypes.KANBAN) {
     kanbanClbk = (row: any, isNewRow: boolean) => {
       addOrEditStackRow(row, isNewRow)
     }
   }
+
   if (isNew.value) {
     await _save(rowState.value, undefined, {
       kanbanClbk,
     })
-    reloadTrigger?.trigger()
-    reloadViewDataTrigger?.trigger()
   } else {
     await _save(undefined, undefined, {
       kanbanClbk,
     })
     _loadRow()
+  }
+
+  if (!props.skipReload) {
     reloadTrigger?.trigger()
     reloadViewDataTrigger?.trigger()
   }
+
   isUnsavedFormExist.value = false
 
   if (props.closeAfterSave) {
@@ -234,6 +242,8 @@ const save = async () => {
   }
 
   emits('createdRecord', _row.value.row)
+
+  isSaving.value = false
 }
 
 const isPreventChangeModalOpen = ref(false)
@@ -871,6 +881,7 @@ export default {
               <NcButton
                 v-e="['c:row-expand:save']"
                 :disabled="changedColumns.size === 0 && !isUnsavedFormExist"
+                :loading="isSaving"
                 class="nc-expand-form-save-btn !xs:(text-base)"
                 data-testid="nc-expanded-form-save"
                 type="primary"
@@ -917,7 +928,7 @@ export default {
       <div class="flex flex-row justify-end gap-x-2 mt-5">
         <NcButton type="secondary" @click="discardPreventModal">{{ $t('labels.discard') }}</NcButton>
 
-        <NcButton key="submit" type="primary" label="Rename Table" loading-label="Renaming Table" @click="saveChanges">
+        <NcButton key="submit" type="primary" :loading="isSaving" @click="saveChanges">
           {{ $t('tooltip.saveChanges') }}
         </NcButton>
       </div>
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index 01679e296a..8a5ee4eecf 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -60,7 +60,7 @@ import type { CellRange, Row } from '#imports'
 const props = defineProps<{
   data: Row[]
   paginationData?: PaginatedType
-  loadData?: (params?: any) => Promise<void>
+  loadData?: (params?: any, shouldShowLoading?: boolean) => Promise<void>
   changePage?: (page: number) => void
   callAddEmptyRow?: (addAfter?: number) => Row | undefined
   deleteRow?: (rowIndex: number, undo?: boolean) => Promise<void>
@@ -1064,13 +1064,27 @@ async function resetAndChangePage(row: number, col: number, pageChange?: number)
   scrollToCell?.()
 }
 
-const saveOrUpdateRecords = async (args: { metaValue?: TableType; viewMetaValue?: ViewType; data?: any } = {}) => {
+const temporaryNewRowStore = ref<Row[]>([])
+
+const saveOrUpdateRecords = async (
+  args: { metaValue?: TableType; viewMetaValue?: ViewType; data?: any; keepNewRecords?: boolean } = {},
+) => {
   for (const currentRow of args.data || dataRef.value) {
+    if (currentRow.rowMeta.fromExpandedForm) continue
+
     /** if new record save row and save the LTAR cells */
     if (currentRow.rowMeta.new) {
-      const savedRow = await updateOrSaveRow?.(currentRow, '', {}, args)
-      await syncLTARRefs?.(currentRow, savedRow, args)
-      currentRow.rowMeta.changed = false
+      const beforeSave = clone(currentRow)
+      const savedRow = await updateOrSaveRow?.(currentRow, '', currentRow.rowMeta.ltarState || {}, args)
+      if (savedRow) {
+        currentRow.rowMeta.changed = false
+      } else {
+        if (args.keepNewRecords) {
+          if (beforeSave.rowMeta.new && Object.keys(beforeSave.row).length) {
+            temporaryNewRowStore.value.push(beforeSave)
+          }
+        }
+      }
       continue
     }
 
@@ -1277,7 +1291,10 @@ const showFillHandle = computed(
       isFormula(fields.value[activeCell.col]) ||
       isCreatedOrLastModifiedTimeCol(fields.value[activeCell.col]) ||
       isCreatedOrLastModifiedByCol(fields.value[activeCell.col])
-    ),
+    ) &&
+    !isViewDataLoading.value &&
+    !isPaginationLoading.value &&
+    dataRef.value.length,
 )
 
 watch(
@@ -1322,16 +1339,23 @@ eventBus.on(async (event, payload) => {
 })
 
 async function reloadViewDataHandler(params: void | { shouldShowLoading?: boolean | undefined; offset?: number | undefined }) {
-  isViewDataLoading.value = true
+  if (params?.shouldShowLoading) isViewDataLoading.value = true
 
   if (predictedNextColumn.value?.length) {
     const fieldsAvailable = meta.value?.columns?.map((c) => c.title)
     predictedNextColumn.value = predictedNextColumn.value.filter((c) => !fieldsAvailable?.includes(c.title))
   }
   // save any unsaved data before reload
-  await saveOrUpdateRecords()
+  await saveOrUpdateRecords({
+    keepNewRecords: true,
+  })
 
-  await loadData?.({ ...(params?.offset !== undefined ? { offset: params.offset } : {}) })
+  await loadData?.({ ...(params?.offset !== undefined ? { offset: params.offset } : {}) }, params?.shouldShowLoading)
+
+  if (temporaryNewRowStore.value.length) {
+    dataRef.value.push(...temporaryNewRowStore.value)
+    temporaryNewRowStore.value = []
+  }
 
   calculateSlices()
 
diff --git a/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts b/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts
index 3765a7904e..4613338ae8 100644
--- a/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts
+++ b/packages/nc-gui/components/smartsheet/grid/useColumnDrag.ts
@@ -9,7 +9,7 @@ export const useColumnDrag = ({
   tableBodyEl: Ref<HTMLElement | undefined>
   gridWrapper: Ref<HTMLElement | undefined>
 }) => {
-  const { eventBus } = useSmartsheetStoreOrThrow()
+  const { eventBus, isDefaultView, meta } = useSmartsheetStoreOrThrow()
   const { addUndo, defineViewScope } = useUndoRedo()
 
   const { activeView } = storeToRefs(useViewsStore())
@@ -22,6 +22,24 @@ export const useColumnDrag = ({
   const dragColPlaceholderDomRef = ref<HTMLElement | null>(null)
   const toBeDroppedColId = ref<string | null>(null)
 
+  const updateDefaultViewColumnOrder = (columnId: string, order: number) => {
+    if (!meta.value?.columns) return
+
+    const colIndex = meta.value.columns.findIndex((c) => c.id === columnId)
+    if (colIndex !== -1) {
+      meta.value.columns[colIndex].meta = { ...(meta.value.columns[colIndex].meta || {}), defaultViewColOrder: order }
+      meta.value.columns = (meta.value.columns || []).map((c) => {
+        if (c.id !== columnId) return c
+
+        c.meta = { ...(c.meta || {}), defaultViewColOrder: order }
+        return c
+      })
+    }
+    if (meta.value.columnsById[columnId]) {
+      meta.value.columnsById[columnId].meta = { ...(meta.value.columnsById[columnId] || {}), defaultViewColOrder: order }
+    }
+  }
+
   const reorderColumn = async (colId: string, toColId: string) => {
     const toBeReorderedViewCol = gridViewCols.value[colId]
 
@@ -46,12 +64,19 @@ export const useColumnDrag = ({
 
     toBeReorderedViewCol.order = newOrder
 
+    if (isDefaultView.value && toBeReorderedViewCol.fk_column_id) {
+      updateDefaultViewColumnOrder(toBeReorderedViewCol.fk_column_id, newOrder)
+    }
+
     addUndo({
       undo: {
         fn: async () => {
           if (!fields.value) return
 
           toBeReorderedViewCol.order = oldOrder
+          if (isDefaultView.value) {
+            updateDefaultViewColumnOrder(toBeReorderedViewCol.fk_column_id, oldOrder)
+          }
           await updateGridViewColumn(colId, { order: oldOrder } as any)
 
           eventBus.emit(SmartsheetStoreEvents.FIELD_RELOAD)
@@ -63,6 +88,9 @@ export const useColumnDrag = ({
           if (!fields.value) return
 
           toBeReorderedViewCol.order = newOrder
+          if (isDefaultView.value) {
+            updateDefaultViewColumnOrder(toBeReorderedViewCol.fk_column_id, newOrder)
+          }
           await updateGridViewColumn(colId, { order: newOrder } as any)
 
           eventBus.emit(SmartsheetStoreEvents.FIELD_RELOAD)
diff --git a/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue b/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue
index 15c49464e9..88de18ec18 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/CreateGroupBy.vue
@@ -12,8 +12,6 @@ const emits = defineEmits(['created'])
 
 const { isParentOpen, columns } = toRefs(props)
 
-const activeView = inject(ActiveViewInj, ref())
-
 const meta = inject(MetaInj, ref())
 
 const { showSystemFields, metaColumnById } = useViewColumnsOrThrow()
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index d72330aefa..17ce92c284 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -54,7 +54,7 @@ const {
   toggleFieldVisibility,
 } = useViewColumnsOrThrow()
 
-const { eventBus } = useSmartsheetStoreOrThrow()
+const { eventBus, isDefaultView } = useSmartsheetStoreOrThrow()
 
 const { addUndo, defineViewScope } = useUndoRedo()
 
@@ -127,7 +127,7 @@ const onMove = async (_event: { moved: { newIndex: number; oldIndex: number } },
       fields.value.map(async (field, index) => {
         if (field.order !== index + 1) {
           field.order = index + 1
-          await saveOrUpdate(field, index, true)
+          await saveOrUpdate(field, index, true, !!isDefaultView.value)
         }
       }),
     )
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index d35c300cf4..edc64d18fc 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -21,6 +21,7 @@ import {
   provide,
   ref,
   toRef,
+  useExpandedFormDetachedProvider,
   useMetas,
   useProvideCalendarViewStore,
   useProvideKanbanViewStore,
@@ -83,6 +84,7 @@ provide(
   ReadonlyInj,
   computed(() => !isUIAllowed('dataEdit')),
 )
+useExpandedFormDetachedProvider()
 
 useProvideViewColumns(activeView, meta, () => reloadViewDataEventHook?.trigger())
 useProvideViewGroupBy(activeView, meta, xWhere)
diff --git a/packages/nc-gui/components/virtual-cell/BelongsTo.vue b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
index 6604907b84..ef79796c27 100644
--- a/packages/nc-gui/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
@@ -40,6 +40,8 @@ const { isUIAllowed } = useRoles()
 
 const listItemsDlg = ref(false)
 
+const isOpen = ref(false)
+
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
 
 const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, relatedTableDisplayValuePropId, unlink } =
@@ -47,8 +49,6 @@ const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, re
 
 await loadRelatedTableMeta()
 
-const addIcon = computed(() => (cellValue?.value ? 'expand' : 'plus'))
-
 const value = computed(() => {
   if (cellValue?.value) {
     return cellValue?.value
@@ -80,53 +80,70 @@ const belongsToColumn = computed(
     relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
 )
 
-const plusBtnRef = ref<HTMLElement | null>(null)
+watch(listItemsDlg, () => {
+  isOpen.value = listItemsDlg.value
+})
+
+// When isOpen is false, ensure the listItemsDlg is also closed.
+watch(
+  isOpen,
+  (next) => {
+    if (!next) {
+      listItemsDlg.value = false
+    }
+  },
+  { flush: 'post' },
+)
 
-watch([listItemsDlg], () => {
-  if (!listItemsDlg.value) {
-    plusBtnRef.value?.focus()
+watch(value, (next) => {
+  if (next) {
+    isOpen.value = false
   }
 })
 </script>
 
 <template>
   <div class="flex w-full chips-wrapper items-center" :class="{ active }">
-    <div class="nc-cell-field chips flex items-center flex-1">
-      <template v-if="value && (relatedTableDisplayValueProp || relatedTableDisplayValuePropId)">
-        <VirtualCellComponentsItemChip
-          :item="value"
-          :value="
-            !Array.isArray(value) && typeof value === 'object'
-              ? value[relatedTableDisplayValueProp] ?? value[relatedTableDisplayValuePropId]
-              : value
-          "
+    <LazyVirtualCellComponentsLinkRecordDropdown v-model:is-open="isOpen">
+      <div class="flex items-center w-full">
+        <div class="nc-cell-field chips flex items-center flex-1">
+          <template v-if="value && (relatedTableDisplayValueProp || relatedTableDisplayValuePropId)">
+            <VirtualCellComponentsItemChip
+              :item="value"
+              :value="
+                !Array.isArray(value) && typeof value === 'object'
+                  ? value[relatedTableDisplayValueProp] ?? value[relatedTableDisplayValuePropId]
+                  : value
+              "
+              :column="belongsToColumn"
+              :show-unlink-button="true"
+              @unlink="unlinkRef(value)"
+            />
+          </template>
+        </div>
+
+        <div
+          v-if="!readOnly && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
+          class="flex-none flex group items-center min-w-4"
+          tabindex="0"
+          @keydown.enter.stop="listItemsDlg = true"
+        >
+          <GeneralIcon
+            icon="plus"
+            class="flex-none select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
+            @click.stop="listItemsDlg = true"
+          />
+        </div>
+      </div>
+
+      <template #overlay>
+        <LazyVirtualCellComponentsUnLinkedItems
+          v-if="listItemsDlg"
+          v-model="listItemsDlg"
           :column="belongsToColumn"
-          :show-unlink-button="true"
-          @unlink="unlinkRef(value)"
-        />
-      </template>
-    </div>
-
-    <div
-      v-if="!readOnly && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
-      ref="plusBtnRef"
-      class="flex justify-end group gap-1 min-h-[30px] items-center"
-      tabindex="0"
-      @keydown.enter.stop="listItemsDlg = true"
-    >
-      <GeneralIcon
-        :icon="addIcon"
-        class="select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
-        @click.stop="listItemsDlg = true"
-      />
-    </div>
-
-    <LazyVirtualCellComponentsUnLinkedItems
-      v-if="listItemsDlg"
-      v-model="listItemsDlg"
-      :column="belongsToColumn"
-      @attach-record="listItemsDlg = true"
-    />
+          hide-back-btn
+        /> </template
+    ></LazyVirtualCellComponentsLinkRecordDropdown>
   </div>
 </template>
 
diff --git a/packages/nc-gui/components/virtual-cell/HasMany.vue b/packages/nc-gui/components/virtual-cell/HasMany.vue
index 5ce0888c06..707ef50804 100644
--- a/packages/nc-gui/components/virtual-cell/HasMany.vue
+++ b/packages/nc-gui/components/virtual-cell/HasMany.vue
@@ -37,6 +37,10 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
+const isOpen = ref(false)
+
+const hideBackBtn = ref(false)
+
 const { isUIAllowed } = useRoles()
 
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
@@ -85,6 +89,31 @@ const hasManyColumn = computed(
 const onAttachRecord = () => {
   childListDlg.value = false
   listItemsDlg.value = true
+  hideBackBtn.value = false
+}
+
+const onAttachLinkedRecord = () => {
+  listItemsDlg.value = false
+  childListDlg.value = true
+}
+
+const openChildList = () => {
+  if (isUnderLookup.value) return
+
+  childListDlg.value = true
+  listItemsDlg.value = false
+
+  isOpen.value = true
+  hideBackBtn.value = false
+}
+
+const openListDlg = () => {
+  if (isUnderLookup.value) return
+
+  listItemsDlg.value = true
+  childListDlg.value = false
+  isOpen.value = true
+  hideBackBtn.value = true
 }
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
@@ -95,53 +124,75 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
       break
   }
 })
+
+watch([childListDlg, listItemsDlg], () => {
+  isOpen.value = childListDlg.value || listItemsDlg.value
+})
+
+watch(
+  isOpen,
+  (next) => {
+    if (!next) {
+      listItemsDlg.value = false
+      childListDlg.value = false
+    }
+  },
+  { flush: 'post' },
+)
 </script>
 
 <template>
-  <div class="flex items-center gap-1 w-full chips-wrapper">
-    <div class="chips flex items-center img-container flex-1 hm-items flex-nowrap min-w-0 overflow-hidden">
-      <template v-if="cells">
-        <VirtualCellComponentsItemChip
-          v-for="(cell, i) of cells"
-          :key="i"
-          :item="cell.item"
-          :value="cell.value"
-          :column="hasManyColumn"
-          :show-unlink-button="true"
-          @unlink="unlinkRef(cell.item)"
+  <LazyVirtualCellComponentsLinkRecordDropdown v-model:is-open="isOpen">
+    <div class="flex items-center gap-1 w-full chips-wrapper">
+      <div class="chips flex items-center img-container flex-1 hm-items flex-nowrap min-w-0 overflow-hidden">
+        <template v-if="cells">
+          <VirtualCellComponentsItemChip
+            v-for="(cell, i) of cells"
+            :key="i"
+            :item="cell.item"
+            :value="cell.value"
+            :column="hasManyColumn"
+            :show-unlink-button="true"
+            @unlink="unlinkRef(cell.item)"
+          />
+
+          <span v-if="cellValue?.length === 10" class="caption pointer ml-1 grey--text" @click="openChildList"> more... </span>
+        </template>
+      </div>
+
+      <div v-if="!isUnderLookup && !isSystemColumn(column)" class="flex justify-end gap-1 min-h-[30px] items-center">
+        <GeneralIcon
+          icon="expand"
+          class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
+          @click.stop="openChildList"
         />
 
-        <span v-if="cellValue?.length === 10" class="caption pointer ml-1 grey--text" @click="childListDlg = true">
-          more...
-        </span>
-      </template>
+        <GeneralIcon
+          v-if="(!readOnly && isUIAllowed('dataEdit')) || isForm"
+          icon="plus"
+          class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
+          @click.stop="openListDlg"
+        />
+      </div>
     </div>
-
-    <div v-if="!isUnderLookup && !isSystemColumn(column)" class="flex justify-end gap-1 min-h-[30px] items-center">
-      <GeneralIcon
-        icon="expand"
-        class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
-        @click.stop="childListDlg = true"
+    <template #overlay>
+      <LazyVirtualCellComponentsUnLinkedItems
+        v-if="listItemsDlg"
+        v-model="listItemsDlg"
+        :column="hasManyColumn"
+        :hide-back-btn="hideBackBtn"
+        @attach-linked-record="onAttachLinkedRecord"
       />
 
-      <GeneralIcon
-        v-if="(!readOnly && isUIAllowed('dataEdit')) || isForm"
-        icon="plus"
-        class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
-        @click.stop="listItemsDlg = true"
+      <LazyVirtualCellComponentsLinkedItems
+        v-if="childListDlg"
+        v-model="childListDlg"
+        :cell-value="localCellValue"
+        :column="hasManyColumn"
+        @attach-record="onAttachRecord"
       />
-    </div>
-
-    <LazyVirtualCellComponentsUnLinkedItems v-if="listItemsDlg || childListDlg" v-model="listItemsDlg" :column="hasManyColumn" />
-
-    <LazyVirtualCellComponentsLinkedItems
-      v-if="listItemsDlg || childListDlg"
-      v-model="childListDlg"
-      :cell-value="localCellValue"
-      :column="hasManyColumn"
-      @attach-record="onAttachRecord"
-    />
-  </div>
+    </template>
+  </LazyVirtualCellComponentsLinkRecordDropdown>
 </template>
 
 <style scoped>
diff --git a/packages/nc-gui/components/virtual-cell/Links.vue b/packages/nc-gui/components/virtual-cell/Links.vue
index 2b078fdade..45a54dd307 100644
--- a/packages/nc-gui/components/virtual-cell/Links.vue
+++ b/packages/nc-gui/components/virtual-cell/Links.vue
@@ -25,6 +25,10 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
+const isOpen = ref(false)
+
+const hideBackBtn = ref(false)
+
 const { isUIAllowed } = useRoles()
 
 const { t } = useI18n()
@@ -72,12 +76,22 @@ const toatlRecordsLinked = computed(() => {
 const onAttachRecord = () => {
   childListDlg.value = false
   listItemsDlg.value = true
+  hideBackBtn.value = false
+}
+
+const onAttachLinkedRecord = () => {
+  listItemsDlg.value = false
+  childListDlg.value = true
 }
 
 const openChildList = () => {
   if (isUnderLookup.value) return
 
   childListDlg.value = true
+  listItemsDlg.value = false
+
+  isOpen.value = true
+  hideBackBtn.value = false
 }
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
@@ -85,6 +99,7 @@ useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEven
     case 'Enter':
       if (listItemsDlg.value) return
       childListDlg.value = true
+      isOpen.value = true
       e.stopPropagation()
       break
   }
@@ -101,69 +116,78 @@ const openListDlg = () => {
   if (isUnderLookup.value) return
 
   listItemsDlg.value = true
+  childListDlg.value = false
+  isOpen.value = true
+  hideBackBtn.value = true
 }
 
-const plusBtnRef = ref<HTMLElement | null>(null)
-const childListDlgRef = ref<HTMLElement | null>(null)
-
-watch([childListDlg], () => {
-  if (!childListDlg.value) {
-    childListDlgRef.value?.focus()
-  }
+watch([childListDlg, listItemsDlg], () => {
+  isOpen.value = childListDlg.value || listItemsDlg.value
 })
 
-watch([listItemsDlg], () => {
-  if (!listItemsDlg.value) {
-    plusBtnRef.value?.focus()
-  }
-})
+watch(
+  isOpen,
+  (next) => {
+    if (!next) {
+      listItemsDlg.value = false
+      childListDlg.value = false
+    }
+  },
+  { flush: 'post' },
+)
 </script>
 
 <template>
   <div class="nc-cell-field flex w-full group items-center nc-links-wrapper py-1" @dblclick.stop="openChildList">
-    <div class="block flex-shrink truncate">
-      <component
-        :is="isUnderLookup ? 'span' : 'a'"
-        ref="childListDlgRef"
-        v-e="['c:cell:links:modal:open']"
-        :title="textVal"
-        class="text-center nc-datatype-link underline-transparent"
-        :class="{ '!text-gray-300': !textVal }"
-        :tabindex="readOnly ? -1 : 0"
-        @click.stop.prevent="openChildList"
-        @keydown.enter.stop.prevent="openChildList"
-      >
-        {{ textVal }}
-      </component>
-    </div>
-    <div class="flex-grow" />
-
-    <div
-      v-if="!isUnderLookup"
-      ref="plusBtnRef"
-      :tabindex="readOnly ? -1 : 0"
-      class="!xs:hidden flex group justify-end group-hover:flex items-center"
-      @keydown.enter.stop="openListDlg"
-    >
-      <MdiPlus
-        v-if="(!readOnly && isUIAllowed('dataEdit')) || isForm"
-        class="select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
-        @click.stop="openListDlg"
-      />
-    </div>
-    <LazyVirtualCellComponentsUnLinkedItems
-      v-if="listItemsDlg || childListDlg"
-      v-model="listItemsDlg"
-      :column="relatedTableDisplayColumn"
-    />
-
-    <LazyVirtualCellComponentsLinkedItems
-      v-if="listItemsDlg || childListDlg"
-      v-model="childListDlg"
-      :items="toatlRecordsLinked"
-      :column="relatedTableDisplayColumn"
-      :cell-value="localCellValue"
-      @attach-record="onAttachRecord"
-    />
+    <LazyVirtualCellComponentsLinkRecordDropdown v-model:is-open="isOpen">
+      <div class="flex w-full group items-center">
+        <div class="block flex-shrink truncate">
+          <component
+            :is="isUnderLookup ? 'span' : 'a'"
+            v-e="['c:cell:links:modal:open']"
+            :title="textVal"
+            class="text-center nc-datatype-link underline-transparent"
+            :class="{ '!text-gray-300': !textVal }"
+            :tabindex="readOnly ? -1 : 0"
+            @click.stop.prevent="openChildList"
+            @keydown.enter.stop.prevent="openChildList"
+          >
+            {{ textVal }}
+          </component>
+        </div>
+        <div class="flex-grow" />
+
+        <div
+          v-if="!isUnderLookup"
+          :tabindex="readOnly ? -1 : 0"
+          class="!xs:hidden flex group justify-end group-hover:flex items-center"
+          @keydown.enter.stop="openListDlg"
+        >
+          <MdiPlus
+            v-if="(!readOnly && isUIAllowed('dataEdit')) || isForm"
+            class="select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
+            @click.stop="openListDlg"
+          />
+        </div>
+      </div>
+
+      <template #overlay>
+        <LazyVirtualCellComponentsLinkedItems
+          v-if="childListDlg"
+          v-model="childListDlg"
+          :items="toatlRecordsLinked"
+          :column="relatedTableDisplayColumn"
+          :cell-value="localCellValue"
+          @attach-record="onAttachRecord"
+        />
+        <LazyVirtualCellComponentsUnLinkedItems
+          v-if="listItemsDlg"
+          v-model="listItemsDlg"
+          :column="relatedTableDisplayColumn"
+          :hide-back-btn="hideBackBtn"
+          @attach-linked-record="onAttachLinkedRecord"
+        />
+      </template>
+    </LazyVirtualCellComponentsLinkRecordDropdown>
   </div>
 </template>
diff --git a/packages/nc-gui/components/virtual-cell/ManyToMany.vue b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
index a0ebdc4b43..e5681f6236 100644
--- a/packages/nc-gui/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
@@ -38,6 +38,10 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
+const isOpen = ref(false)
+
+const hideBackBtn = ref(false)
+
 const { isUIAllowed } = useRoles()
 
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
@@ -81,6 +85,31 @@ const unlinkRef = async (rec: Record<string, any>) => {
 const onAttachRecord = () => {
   childListDlg.value = false
   listItemsDlg.value = true
+  hideBackBtn.value = false
+}
+
+const onAttachLinkedRecord = () => {
+  listItemsDlg.value = false
+  childListDlg.value = true
+}
+
+const openChildList = () => {
+  if (isUnderLookup.value) return
+
+  childListDlg.value = true
+  listItemsDlg.value = false
+
+  isOpen.value = true
+  hideBackBtn.value = false
+}
+
+const openListDlg = () => {
+  if (isUnderLookup.value) return
+
+  listItemsDlg.value = true
+  childListDlg.value = false
+  isOpen.value = true
+  hideBackBtn.value = true
 }
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e: KeyboardEvent) => {
@@ -96,53 +125,75 @@ const m2mColumn = computed(
   () =>
     relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
 )
+
+watch([childListDlg, listItemsDlg], () => {
+  isOpen.value = childListDlg.value || listItemsDlg.value
+})
+
+watch(
+  isOpen,
+  (next) => {
+    if (!next) {
+      listItemsDlg.value = false
+      childListDlg.value = false
+    }
+  },
+  { flush: 'post' },
+)
 </script>
 
 <template>
-  <div class="flex items-center gap-1 w-full chips-wrapper">
-    <div class="chips flex items-center img-container flex-1 hm-items flex-nowrap min-w-0 overflow-hidden">
-      <template v-if="cells">
-        <VirtualCellComponentsItemChip
-          v-for="(cell, i) of cells"
-          :key="i"
-          :item="cell.item"
-          :value="cell.value"
-          :column="m2mColumn"
-          :show-unlink-button="true"
-          @unlink="unlinkRef(cell.item)"
+  <LazyVirtualCellComponentsLinkRecordDropdown v-model:is-open="isOpen">
+    <div class="flex items-center gap-1 w-full chips-wrapper">
+      <div class="chips flex items-center img-container flex-1 hm-items flex-nowrap min-w-0 overflow-hidden">
+        <template v-if="cells">
+          <VirtualCellComponentsItemChip
+            v-for="(cell, i) of cells"
+            :key="i"
+            :item="cell.item"
+            :value="cell.value"
+            :column="m2mColumn"
+            :show-unlink-button="true"
+            @unlink="unlinkRef(cell.item)"
+          />
+
+          <span v-if="cells?.length === 10" class="caption pointer ml-1 grey--text" @click.stop="openChildList"> more... </span>
+        </template>
+      </div>
+
+      <div v-if="!isUnderLookup || isForm" class="flex justify-end gap-1 min-h-[30px] items-center">
+        <GeneralIcon
+          icon="expand"
+          class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
+          @click.stop="openChildList"
         />
 
-        <span v-if="cells?.length === 10" class="caption pointer ml-1 grey--text" @click.stop="childListDlg = true">
-          more...
-        </span>
-      </template>
+        <GeneralIcon
+          v-if="!readOnly && isUIAllowed('dataEdit')"
+          icon="plus"
+          class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
+          @click.stop="openListDlg"
+        />
+      </div>
     </div>
 
-    <div v-if="!isUnderLookup || isForm" class="flex justify-end gap-1 min-h-[30px] items-center">
-      <GeneralIcon
-        icon="expand"
-        class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
-        @click.stop="childListDlg = true"
+    <template #overlay>
+      <LazyVirtualCellComponentsLinkedItems
+        v-if="childListDlg"
+        v-model="childListDlg"
+        :cell-value="localCellValue"
+        :column="m2mColumn"
+        @attach-record="onAttachRecord"
       />
-
-      <GeneralIcon
-        v-if="!readOnly && isUIAllowed('dataEdit')"
-        icon="plus"
-        class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
-        @click.stop="listItemsDlg = true"
+      <LazyVirtualCellComponentsUnLinkedItems
+        v-if="listItemsDlg"
+        v-model="listItemsDlg"
+        :column="m2mColumn"
+        :hide-back-btn="hideBackBtn"
+        @attach-linked-record="onAttachLinkedRecord"
       />
-    </div>
-
-    <LazyVirtualCellComponentsUnLinkedItems v-if="listItemsDlg || childListDlg" v-model="listItemsDlg" :column="m2mColumn" />
-
-    <LazyVirtualCellComponentsLinkedItems
-      v-if="listItemsDlg || childListDlg"
-      v-model="childListDlg"
-      :cell-value="localCellValue"
-      :column="m2mColumn"
-      @attach-record="onAttachRecord"
-    />
-  </div>
+    </template>
+  </LazyVirtualCellComponentsLinkRecordDropdown>
 </template>
 
 <style scoped>
diff --git a/packages/nc-gui/components/virtual-cell/OneToOne.vue b/packages/nc-gui/components/virtual-cell/OneToOne.vue
index 6604907b84..9f3188a2aa 100644
--- a/packages/nc-gui/components/virtual-cell/OneToOne.vue
+++ b/packages/nc-gui/components/virtual-cell/OneToOne.vue
@@ -40,6 +40,8 @@ const { isUIAllowed } = useRoles()
 
 const listItemsDlg = ref(false)
 
+const isOpen = ref(false)
+
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
 
 const { relatedTableMeta, loadRelatedTableMeta, relatedTableDisplayValueProp, relatedTableDisplayValuePropId, unlink } =
@@ -80,54 +82,63 @@ const belongsToColumn = computed(
     relatedTableMeta.value?.columns?.find((c: any) => c.title === relatedTableDisplayValueProp.value) as ColumnType | undefined,
 )
 
-const plusBtnRef = ref<HTMLElement | null>(null)
-
-watch([listItemsDlg], () => {
-  if (!listItemsDlg.value) {
-    plusBtnRef.value?.focus()
-  }
+watch(listItemsDlg, () => {
+  isOpen.value = listItemsDlg.value
 })
+
+// When isOpen is false, ensure the listItemsDlg is also closed.
+watch(
+  isOpen,
+  (next) => {
+    if (!next) {
+      listItemsDlg.value = false
+    }
+  },
+  { flush: 'post' },
+)
 </script>
 
 <template>
-  <div class="flex w-full chips-wrapper items-center" :class="{ active }">
-    <div class="nc-cell-field chips flex items-center flex-1">
-      <template v-if="value && (relatedTableDisplayValueProp || relatedTableDisplayValuePropId)">
-        <VirtualCellComponentsItemChip
-          :item="value"
-          :value="
-            !Array.isArray(value) && typeof value === 'object'
-              ? value[relatedTableDisplayValueProp] ?? value[relatedTableDisplayValuePropId]
-              : value
-          "
-          :column="belongsToColumn"
-          :show-unlink-button="true"
-          @unlink="unlinkRef(value)"
+  <LazyVirtualCellComponentsLinkRecordDropdown v-model:is-open="isOpen">
+    <div class="flex w-full chips-wrapper items-center" :class="{ active }">
+      <div class="nc-cell-field chips flex items-center flex-1">
+        <template v-if="value && (relatedTableDisplayValueProp || relatedTableDisplayValuePropId)">
+          <VirtualCellComponentsItemChip
+            :item="value"
+            :value="
+              !Array.isArray(value) && typeof value === 'object'
+                ? value[relatedTableDisplayValueProp] ?? value[relatedTableDisplayValuePropId]
+                : value
+            "
+            :column="belongsToColumn"
+            :show-unlink-button="true"
+            @unlink="unlinkRef(value)"
+          />
+        </template>
+      </div>
+
+      <div
+        v-if="!readOnly && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
+        class="flex justify-end group gap-1 min-h-[30px] items-center"
+        tabindex="0"
+        @keydown.enter.stop="listItemsDlg = true"
+      >
+        <GeneralIcon
+          :icon="addIcon"
+          class="select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
+          @click.stop="listItemsDlg = true"
         />
-      </template>
+      </div>
     </div>
-
-    <div
-      v-if="!readOnly && (isUIAllowed('dataEdit') || isForm) && !isUnderLookup"
-      ref="plusBtnRef"
-      class="flex justify-end group gap-1 min-h-[30px] items-center"
-      tabindex="0"
-      @keydown.enter.stop="listItemsDlg = true"
-    >
-      <GeneralIcon
-        :icon="addIcon"
-        class="select-none !text-md text-gray-700 nc-action-icon nc-plus invisible group-hover:visible group-focus:visible"
-        @click.stop="listItemsDlg = true"
+    <template #overlay>
+      <LazyVirtualCellComponentsUnLinkedItems
+        v-if="listItemsDlg"
+        v-model="listItemsDlg"
+        :column="belongsToColumn"
+        hide-back-btn
       />
-    </div>
-
-    <LazyVirtualCellComponentsUnLinkedItems
-      v-if="listItemsDlg"
-      v-model="listItemsDlg"
-      :column="belongsToColumn"
-      @attach-record="listItemsDlg = true"
-    />
-  </div>
+    </template>
+  </LazyVirtualCellComponentsLinkRecordDropdown>
 </template>
 
 <style scoped lang="scss">
diff --git a/packages/nc-gui/components/virtual-cell/QrCode.vue b/packages/nc-gui/components/virtual-cell/QrCode.vue
index fe31228a67..bef3597d81 100644
--- a/packages/nc-gui/components/virtual-cell/QrCode.vue
+++ b/packages/nc-gui/components/virtual-cell/QrCode.vue
@@ -9,7 +9,7 @@ const cellValue = inject(CellValueInj)
 
 const isGallery = inject(IsGalleryInj, ref(false))
 
-const qrValue = computed(() => String(cellValue?.value))
+const qrValue = computed(() => String(cellValue?.value || ''))
 
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))
 
diff --git a/packages/nc-gui/components/virtual-cell/components/Header.vue b/packages/nc-gui/components/virtual-cell/components/Header.vue
index 282303eba1..12451ef540 100644
--- a/packages/nc-gui/components/virtual-cell/components/Header.vue
+++ b/packages/nc-gui/components/virtual-cell/components/Header.vue
@@ -1,20 +1,22 @@
 <script lang="ts" setup>
 import OnetoOneIcon from '~icons/nc-icons/onetoone'
-import InfoIcon from '~icons/nc-icons/info'
-import FileIcon from '~icons/nc-icons/file'
 
 import { iconMap } from '#imports'
 
-const { relation, relatedTableTitle, displayValue, header, tableTitle } = defineProps<{
+const {
+  relation,
+  relatedTableTitle,
+  tableTitle,
+  linkedRecords = 0,
+} = defineProps<{
   relation: string
   header?: string | null
   tableTitle: string
   relatedTableTitle: string
   displayValue?: string
+  linkedRecords?: number
 }>()
 
-const { isMobileMode } = useGlobal()
-
 const { t } = useI18n()
 
 const relationMeta = computed(() => {
@@ -52,73 +54,46 @@ const relationMeta = computed(() => {
 </script>
 
 <template>
-  <div class="flex sm:justify-between relative pb-2 items-center">
-    <div v-if="!isMobileMode" class="flex text-base font-bold justify-start items-center min-w-36">
-      {{ header ?? '' }}
-    </div>
-    <div class="flex flex-row sm:w-[calc(100%-16rem)] xs:w-full items-center justify-center gap-2 xs:(h-full)">
-      <div class="flex sm:justify-end w-[calc(50%-1.5rem)] xs:(w-[calc(50%-1.5rem)] h-full)">
-        <div
-          class="flex max-w-full xs:w-full flex-shrink-0 xs:(h-full) rounded-md gap-1 text-gray-700 items-center bg-gray-100 px-2 py-1"
-        >
-          <FileIcon class="w-4 h-4 min-w-4" />
-          <span class="truncate">
-            {{ displayValue }}
-          </span>
-        </div>
-      </div>
-      <NcTooltip class="flex-shrink-0">
-        <template #title> {{ relationMeta.title }} </template>
-        <component
-          :is="relationMeta.icon"
-          class="w-7 h-7 p-1 rounded-md"
-          :class="{
-            '!bg-orange-500': relation === 'hm',
-            '!bg-pink-500': relation === 'mm',
-            '!bg-blue-500': relation === 'bt',
-          }"
-        />
-      </NcTooltip>
-      <div class="flex justify-start xs:w-[calc(50%-1.5rem)] w-[calc(50%-1.5rem)] xs:justify-start">
-        <div
-          class="flex rounded-md max-w-full flex-shrink-0 gap-1 items-center px-2 py-1 xs:w-full overflow-hidden"
-          :class="{
-            '!bg-orange-50 !text-orange-500': relation === 'hm',
-            '!bg-pink-50 !text-pink-500': relation === 'mm',
-            '!bg-blue-50 !text-blue-500': relation === 'bt',
-          }"
-        >
-          <MdiFileDocumentMultipleOutline
-            class="w-4 h-4 min-w-4"
-            :class="{
-              '!text-orange-500': relation === 'hm',
-              '!text-pink-500': relation === 'mm',
-              '!text-blue-500': relation === 'bt',
-            }"
-          />
-          <span class="truncate"> {{ relatedTableTitle }} Records </span>
-        </div>
-      </div>
-    </div>
-    <div v-if="!isMobileMode" class="flex flex-row justify-end w-36">
-      <NcTooltip class="z-10" placement="bottom">
-        <template #title>
-          <div class="p-1">
-            <h1 class="text-white font-bold">{{ relationMeta.title }}</h1>
-            <div class="text-white">
-              {{ relationMeta.tooltip_desc }}
-              <span class="bg-gray-700 px-2 rounded-md">
-                {{ tableTitle }}
-              </span>
-              {{ relationMeta.tooltip_desc2 }}
-              <span class="bg-gray-700 px-2 rounded-md">
-                {{ relatedTableTitle }}
-              </span>
-            </div>
+  <div
+    class="flex-none flex rounded-md gap-1 items-center p-1 max-h-7"
+    :class="{
+      'bg-gray-200 text-gray-600': !linkedRecords,
+      'bg-orange-100 text-orange-700': relation === 'hm' && linkedRecords,
+      'bg-pink-100 text-pink-700': relation === 'mm' && linkedRecords,
+      'bg-blue-100 text-blue-700': relation === 'bt' && linkedRecords,
+      'bg-purple-100 text-purple-700': relation === 'oo' && linkedRecords,
+    }"
+  >
+    <NcTooltip class="z-10 flex" placement="bottom">
+      <template #title>
+        <div class="p-1">
+          <h1 class="text-white font-bold">{{ relationMeta.title }}</h1>
+          <div class="text-white">
+            {{ relationMeta.tooltip_desc }}
+            <span class="bg-gray-700 px-2 rounded-md">
+              {{ tableTitle }}
+            </span>
+            {{ relationMeta.tooltip_desc2 }}
+            <span class="bg-gray-700 px-2 rounded-md">
+              {{ relatedTableTitle }}
+            </span>
           </div>
-        </template>
-        <InfoIcon class="w-4 h-4" />
-      </NcTooltip>
+        </div>
+      </template>
+      <component
+        :is="relationMeta.icon"
+        class="flex-none w-5 h-5 p-1 rounded-md"
+        :class="{
+          '!bg-orange-500': relation === 'hm',
+          '!bg-pink-500': relation === 'mm',
+          '!bg-blue-500': relation === 'bt',
+        }"
+      />
+    </NcTooltip>
+
+    <div class="leading-[20px]">
+      {{ linkedRecords || 0 }} {{ $t('general.linked') }}
+      {{ linkedRecords === 1 ? $t('objects.record') : $t('objects.records') }}
     </div>
   </div>
 </template>
diff --git a/packages/nc-gui/components/virtual-cell/components/LinkRecordDropdown.vue b/packages/nc-gui/components/virtual-cell/components/LinkRecordDropdown.vue
new file mode 100644
index 0000000000..1296f641f2
--- /dev/null
+++ b/packages/nc-gui/components/virtual-cell/components/LinkRecordDropdown.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+interface Props {
+  isOpen: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  isOpen: false,
+})
+
+const emits = defineEmits(['update:isOpen'])
+
+const isOpen = useVModel(props, 'isOpen', emits)
+
+const ncLinksDropdownRef = ref<HTMLDivElement>()
+
+const randomClass = `link-records_${Math.floor(Math.random() * 99999)}`
+
+const addOrRemoveClass = (add: boolean = false) => {
+  const dropdownRoot = ncLinksDropdownRef.value?.parentElement?.parentElement?.parentElement?.parentElement as HTMLElement
+  if (dropdownRoot) {
+    if (add) {
+      dropdownRoot.classList.add('inset-0', 'nc-link-dropdown-root', `nc-root-${randomClass}`)
+    } else {
+      dropdownRoot.classList.remove('inset-0', 'nc-link-dropdown-root', `nc-root-${randomClass}`)
+    }
+  }
+}
+
+watch(
+  isOpen,
+  (next) => {
+    if (next) {
+      onClickOutside(document.querySelector(`.${randomClass}`)! as HTMLDivElement, (e) => {
+        const targetEl = e?.target as HTMLElement
+        if (!targetEl?.classList.contains(`nc-root-${randomClass}`) || targetEl?.closest(`.nc-${randomClass}`)) {
+          return
+        }
+        isOpen.value = false
+
+        addOrRemoveClass(false)
+      })
+    } else {
+      addOrRemoveClass(false)
+    }
+  },
+  { flush: 'post' },
+)
+
+watch([ncLinksDropdownRef, isOpen], () => {
+  if (!ncLinksDropdownRef.value) return
+
+  if (isOpen.value) {
+    addOrRemoveClass(true)
+  } else {
+    addOrRemoveClass(false)
+  }
+})
+</script>
+
+<template>
+  <NcDropdown
+    :visible="isOpen"
+    placement="bottom"
+    overlay-class-name="nc-links-dropdown !min-w-[540px]"
+    :class="`.nc-${randomClass}`"
+  >
+    <slot />
+    <template #overlay>
+      <div ref="ncLinksDropdownRef" class="h-[412px] w-[540px]" :class="`${randomClass}`">
+        <slot name="overlay" />
+      </div>
+    </template>
+  </NcDropdown>
+</template>
+
+<style lang="scss">
+.nc-links-dropdown {
+  z-index: 1000 !important;
+}
+.nc-link-dropdown-root {
+  z-index: 1000;
+}
+</style>
diff --git a/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue b/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
index 5762c2c0d6..6be91be7a1 100644
--- a/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/LinkedItems.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { type ColumnType, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
+import { RelationTypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
 import {
   ColumnInj,
   IsFormInj,
@@ -30,10 +31,14 @@ const vModel = useVModel(props, 'modelValue', emit)
 
 const { isMobileMode } = useGlobal()
 
+const { t } = useI18n()
+
 const isForm = inject(IsFormInj, ref(false))
 
 const isPublic = inject(IsPublicInj, ref(false))
 
+const isExpandedFormCloseAfterSave = ref(false)
+
 const injectedColumn = inject(ColumnInj, ref())
 
 const readOnly = inject(ReadonlyInj, ref(false))
@@ -58,7 +63,7 @@ const {
   relatedTableMeta,
   link,
   meta,
-  headerDisplayValue,
+  row,
   resetChildrenListOffsetCount,
 } = useLTARStoreOrThrow()
 
@@ -68,7 +73,7 @@ watch(
   [vModel, isForm],
   (nextVal) => {
     if ((nextVal[0] || nextVal[1]) && !isNew.value) {
-      loadChildrenList()
+      loadChildrenList(true)
     }
 
     // reset offset count when closing modal
@@ -102,20 +107,96 @@ const attachmentCol = computedInject(FieldsInj, (_fields) => {
 const fields = computedInject(FieldsInj, (_fields) => {
   return (relatedTableMeta.value.columns ?? [])
     .filter((col) => !isSystemColumn(col) && !isPrimary(col) && !isLinksOrLTAR(col) && !isAttachment(col))
-    .slice(0, isMobileMode.value ? 1 : 4)
+    .sort((a, b) => {
+      if (a.meta?.defaultViewColOrder !== undefined && b.meta?.defaultViewColOrder !== undefined) {
+        return a.meta.defaultViewColOrder - b.meta.defaultViewColOrder
+      }
+      return 0
+    })
+    .slice(0, isMobileMode.value ? 1 : 3)
 })
 
 const expandedFormDlg = ref(false)
 
 const expandedFormRow = ref({})
 
+/** populate initial state for a new row which is parent/child of current record */
+const newRowState = computed(() => {
+  if (isNew.value) return {}
+  const colOpt = (injectedColumn?.value as ColumnType)?.colOptions as LinkToAnotherRecordType
+  const colInRelatedTable: ColumnType | undefined = relatedTableMeta?.value?.columns?.find((col) => {
+    // Links as for the case of 'mm' we need the 'Links' column
+    if (!isLinksOrLTAR(col)) return false
+    const colOpt1 = col?.colOptions as LinkToAnotherRecordType
+    if (colOpt1?.fk_related_model_id !== meta.value.id) return false
+
+    if (colOpt.type === RelationTypes.MANY_TO_MANY && colOpt1?.type === RelationTypes.MANY_TO_MANY) {
+      return (
+        colOpt.fk_parent_column_id === colOpt1.fk_child_column_id && colOpt.fk_child_column_id === colOpt1.fk_parent_column_id
+      )
+    } else {
+      return (
+        colOpt.fk_parent_column_id === colOpt1.fk_parent_column_id && colOpt.fk_child_column_id === colOpt1.fk_child_column_id
+      )
+    }
+  })
+  if (!colInRelatedTable) return {}
+  const relatedTableColOpt = colInRelatedTable?.colOptions as LinkToAnotherRecordType
+  if (!relatedTableColOpt) return {}
+
+  if (relatedTableColOpt.type === RelationTypes.BELONGS_TO) {
+    return {
+      [colInRelatedTable.title as string]: row?.value?.row,
+    }
+  } else {
+    return {
+      [colInRelatedTable.title as string]: row?.value && [row.value.row],
+    }
+  }
+})
+
 const colTitle = computed(() => injectedColumn.value?.title || '')
 
 const onClick = (row: Row) => {
-  if (readOnly.value) return
+  if (readOnly.value || isForm.value) return
   expandedFormRow.value = row
   expandedFormDlg.value = true
 }
+const addNewRecord = () => {
+  expandedFormRow.value = {}
+  expandedFormDlg.value = true
+  isExpandedFormCloseAfterSave.value = true
+}
+
+const onCreatedRecord = (record: any) => {
+  const msgVNode = h(
+    'div',
+    {
+      class: 'ml-1 inline-flex flex-col gap-1 items-start',
+    },
+    [
+      h(
+        'span',
+        {
+          class: 'font-semibold',
+        },
+        t('activity.recordCreatedLinked'),
+      ),
+      h(
+        'span',
+        {
+          class: 'text-gray-500',
+        },
+        t('activity.gotSavedLinkedSuccessfully', {
+          tableName: relatedTableMeta.value?.title,
+          recordTitle: record[relatedTableDisplayValueProp.value],
+        }),
+      ),
+    ],
+  )
+
+  message.success(msgVNode)
+}
 
 const relation = computed(() => {
   return injectedColumn!.value?.colOptions?.type
@@ -129,6 +210,9 @@ watch(
 )
 
 watch(expandedFormDlg, () => {
+  if (!expandedFormDlg.value) {
+    isExpandedFormCloseAfterSave.value = false
+  }
   childrenExcludedOffsetCount.value = 0
   childrenListOffsetCount.value = 0
 })
@@ -154,6 +238,10 @@ const skeletonCount = computed(() => {
 })
 
 const totalItemsToShow = computed(() => {
+  if (isForm.value || isNew.value) {
+    return state.value?.[colTitle.value]?.length
+  }
+
   if (isChildrenLoading.value) {
     return props.items
   }
@@ -204,6 +292,10 @@ const linkedShortcuts = (e: KeyboardEvent) => {
 
 onMounted(() => {
   window.addEventListener('keydown', linkedShortcuts)
+
+  setTimeout(() => {
+    filterQueryRef.value?.focus()
+  }, 100)
 })
 
 const childrenListRef = ref<HTMLDivElement>()
@@ -226,167 +318,151 @@ const onFilterChange = () => {
 </script>
 
 <template>
-  <NcModal
-    v-model:visible="vModel"
-    :body-style="{ 'max-height': '640px', 'height': '85vh' }"
-    :class="{ active: vModel }"
-    :closable="false"
-    :footer="null"
-    :width="isForm ? 600 : 800"
-    size="medium"
-    wrap-class-name="nc-modal-child-list"
-  >
-    <LazyVirtualCellComponentsHeader
-      v-if="!isForm"
-      :display-value="headerDisplayValue"
-      :header="$t('activity.linkedRecords')"
-      :linked-records="childrenListCount"
-      :related-table-title="relatedTableMeta?.title"
-      :relation="relation"
-      :table-title="meta?.title"
-    />
-    <div v-if="!isForm" class="flex mt-2 mb-2 items-center gap-2">
-      <div class="flex items-center border-1 p-1 rounded-md w-full border-gray-200 !focus-within:border-primary">
-        <MdiMagnify class="w-5 h-5 ml-2 text-gray-500" />
-        <a-input
-          ref="filterQueryRef"
-          v-model:value="childrenListPagination.query"
-          :bordered="false"
-          :placeholder="`Search in ${relatedTableMeta?.title}`"
-          class="w-full !sm:rounded-md xs:min-h-8 !xs:rounded-xl"
-          size="small"
-          @change="onFilterChange"
-          @keydown.capture.stop="
-            (e) => {
-              if (e.key === 'Escape') {
-                filterQueryRef?.blur()
+  <div class="nc-modal-child-list h-full w-full" :class="{ active: vModel }" @keydown.enter.stop>
+    <div class="flex flex-col h-full">
+      <div class="nc-dropdown-link-record-header bg-gray-100 py-2 rounded-t-md flex justify-between pl-3 pr-2 gap-2">
+        <div v-if="!isForm" class="flex-1 nc-dropdown-link-record-search-wrapper flex items-center py-0.5 rounded-md">
+          <MdiMagnify class="nc-search-icon w-5 h-5" />
+          <a-input
+            ref="filterQueryRef"
+            v-model:value="childrenListPagination.query"
+            :bordered="false"
+            placeholder="Search linked records..."
+            class="w-full min-h-4"
+            size="small"
+            @change="onFilterChange"
+            @keydown.capture.stop="
+              (e) => {
+                if (e.key === 'Escape') {
+                  filterQueryRef?.blur()
+                }
               }
-            }
-          "
-        >
-        </a-input>
+            "
+          >
+          </a-input>
+        </div>
+        <div v-else>&nbsp;</div>
+        <LazyVirtualCellComponentsHeader
+          data-testid="nc-link-count-info"
+          :linked-records="totalItemsToShow"
+          :related-table-title="relatedTableMeta?.title"
+          :relation="relation"
+          :table-title="meta?.title"
+        />
       </div>
-    </div>
-    <div ref="childrenListRef" class="flex flex-col flex-grow nc-scrollbar-md cursor-pointer pr-1">
-      <div v-if="isDataExist || isChildrenLoading" class="mt-2 mb-2">
-        <div class="cursor-pointer pr-1">
-          <template v-if="isChildrenLoading">
-            <div
-              v-for="(_x, i) in Array.from({ length: skeletonCount })"
-              :key="i"
-              class="!border-2 flex flex-row gap-2 mb-2 transition-all !rounded-xl relative !border-gray-200 hover:bg-gray-50"
-            >
-              <a-skeleton-image class="h-24 w-24 !rounded-xl" />
-              <div class="flex flex-col m-[.5rem] gap-2 flex-grow justify-center">
-                <a-skeleton-input active class="!w-48 !rounded-xl" size="small" />
-                <div class="flex flex-row gap-6 w-10/12">
-                  <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
-                  </div>
-                  <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
-                  </div>
-                  <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
-                  </div>
-                  <div class="flex flex-col gap-0.5">
-                    <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                    <a-skeleton-input active class="!h-4 !w-24" size="small" />
+      <div ref="childrenListRef" class="flex-1 overflow-auto nc-scrollbar-thin">
+        <div v-if="isDataExist || isChildrenLoading">
+          <div class="cursor-pointer">
+            <template v-if="isChildrenLoading">
+              <div
+                v-for="(_x, i) in Array.from({ length: skeletonCount })"
+                :key="i"
+                class="flex flex-row gap-2 mb-2 transition-all relative !border-gray-200 hover:bg-gray-50"
+              >
+                <div class="flex items-center">
+                  <a-skeleton-image class="h-14 w-14 !rounded-xl children:!h-full" />
+                </div>
+                <div class="flex flex-col gap-2 flex-grow justify-center">
+                  <a-skeleton-input active class="h-3 !w-48 !rounded-xl" size="small" />
+                  <div class="flex flex-row gap-6 w-10/12">
+                    <div class="flex flex-col gap-0.5">
+                      <a-skeleton-input active class="!h-2 !w-12" size="small" />
+                      <a-skeleton-input active class="!h-2 !w-24" size="small" />
+                    </div>
+                    <div class="flex flex-col gap-0.5">
+                      <a-skeleton-input active class="!h-2 !w-12" size="small" />
+                      <a-skeleton-input active class="!h-2 !w-24" size="small" />
+                    </div>
+                    <div class="flex flex-col gap-0.5">
+                      <a-skeleton-input active class="!h-2 !w-12" size="small" />
+                      <a-skeleton-input active class="!h-2 !w-24" size="small" />
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-          </template>
-          <template v-else>
-            <LazyVirtualCellComponentsListItem
-              v-for="(refRow, id) in childrenList?.list ?? state?.[colTitle] ?? []"
-              :key="id"
-              :attachment="attachmentCol"
-              :display-value-type-and-format-prop="displayValueTypeAndFormatProp"
-              :fields="fields"
-              :is-linked="childrenList?.list ? isChildrenListLinked[Number.parseInt(id)] : true"
-              :is-loading="isChildrenListLoading[Number.parseInt(id)]"
-              :related-table-display-value-prop="relatedTableDisplayValueProp"
-              :row="refRow"
-              data-testid="nc-child-list-item"
-              @click="linkOrUnLink(refRow, id)"
-              @expand="onClick(refRow)"
-              @keydown.space.prevent="linkOrUnLink(refRow, id)"
-              @keydown.enter.prevent="() => onClick(refRow, id)"
-            />
-          </template>
-        </div>
-      </div>
-      <div v-else class="pt-1 flex flex-col gap-4 my-auto items-center justify-center text-gray-500 text-center">
-        <img
-          :alt="$t('msg.clickLinkRecordsToAddLinkFromTable', { tableName: relatedTableMeta?.title })"
-          class="!w-[18.5rem] flex-none"
-          src="~assets/img/placeholder/link-records.png"
-        />
-        <div class="text-2xl text-gray-700 font-bold">{{ $t('msg.noLinkedRecords') }}</div>
-        <div class="text-gray-700">
-          {{ $t('msg.clickLinkRecordsToAddLinkFromTable', { tableName: relatedTableMeta?.title }) }}
+            </template>
+            <template v-else>
+              <LazyVirtualCellComponentsListItem
+                v-for="(refRow, id) in childrenList?.list ?? state?.[colTitle] ?? []"
+                :key="id"
+                :attachment="attachmentCol"
+                :display-value-type-and-format-prop="displayValueTypeAndFormatProp"
+                :fields="fields"
+                :is-linked="childrenList?.list ? isChildrenListLinked[Number.parseInt(id)] : true"
+                :is-loading="isChildrenListLoading[Number.parseInt(id)]"
+                :related-table-display-value-prop="relatedTableDisplayValueProp"
+                :row="refRow"
+                data-testid="nc-child-list-item"
+                @link-or-unlink="linkOrUnLink(refRow, id)"
+                @expand="onClick(refRow)"
+                @keydown.space.prevent.stop="linkOrUnLink(refRow, id)"
+                @keydown.enter.prevent.stop="() => onClick(refRow, id)"
+              />
+            </template>
+          </div>
         </div>
+        <div v-else class="h-full flex flex-col gap-2 my-auto items-center justify-center text-gray-500 text-center">
+          <img
+            :alt="$t('msg.clickLinkRecordsToAddLinkFromTable')"
+            class="!w-[158px] flex-none"
+            src="~assets/img/placeholder/link-records.png"
+          />
+          <div class="text-base text-gray-700 font-bold">{{ $t('msg.noLinkedRecords') }}</div>
+          <div class="text-gray-700">
+            {{ $t('msg.clickLinkRecordsToAddLinkFromTable') }}
+          </div>
 
-        <NcButton
-          v-if="!readOnly && childrenListCount < 1"
-          v-e="['c:links:link']"
-          data-testid="nc-child-list-button-link-to"
-          @click="emit('attachRecord')"
-        >
-          <div class="flex items-center gap-1"><MdiPlus /> {{ $t('title.linkRecords') }}</div>
-        </NcButton>
+          <NcButton
+            v-if="!readOnly && (childrenListCount < 1 || (childrenList?.list ?? state?.[colTitle] ?? []).length > 0)"
+            v-e="['c:links:link']"
+            data-testid="nc-child-list-button-link-to"
+            size="small"
+            @click="emit('attachRecord')"
+          >
+            <div class="flex items-center gap-1"><MdiPlus /> {{ $t('title.linkRecords') }}</div>
+          </NcButton>
+        </div>
       </div>
-    </div>
-
-    <div v-if="isMobileMode" class="flex flex-row justify-center items-center w-full my-2">
-      <NcPagination
-        v-if="!isNew && childrenList?.pageInfo"
-        v-model:current="childrenListPagination.page"
-        v-model:page-size="childrenListPagination.size"
-        :total="+childrenList.pageInfo.totalRows!"
-      />
-    </div>
 
-    <div class="my-2 bg-gray-50 border-gray-50 border-b-2"></div>
-
-    <div class="flex flex-row justify-between bg-white relative pt-1">
-      <div v-if="!isForm" class="flex items-center justify-center px-2 rounded-md text-gray-500 bg-brand-50">
-        {{ totalItemsToShow || 0 }} {{ !isMobileMode ? $t('objects.records') : '' }}
-        {{ !isMobileMode && totalItemsToShow !== 0 ? $t('general.are') : '' }}
-        {{ $t('general.linked') }}
-      </div>
-      <div v-else class="flex items-center justify-center px-2 rounded-md text-gray-500 bg-brand-50">
-        <span class="">
-          {{ state?.[colTitle]?.length || 0 }} {{ $t('objects.records') }}
-          {{ state?.[colTitle]?.length !== 0 ? $t('general.are') : '' }}
-          {{ $t('general.linked') }}
-        </span>
-      </div>
-      <div class="!xs:hidden flex absolute -mt-0.75 items-center py-2 justify-center w-full">
-        <NcPagination
-          v-if="!isNew && childrenList?.pageInfo"
-          v-model:current="childrenListPagination.page"
-          v-model:page-size="childrenListPagination.size"
-          :total="+childrenList.pageInfo.totalRows!"
-          mode="simple"
-        />
-      </div>
-      <div class="flex flex-row gap-2">
-        <NcButton v-if="!isForm" class="nc-close-btn" type="ghost" @click="vModel = false"> {{ $t('general.finish') }} </NcButton>
-        <NcButton
-          v-if="!readOnly && childrenListCount > 0"
-          v-e="['c:links:link']"
-          data-testid="nc-child-list-button-link-to"
-          @click="emit('attachRecord')"
-        >
-          <div class="flex items-center gap-1">
-            <MdiPlus class="!xs:hidden" /> {{ isMobileMode ? $t('title.linkMore') : $t('title.linkMoreRecords') }}
+      <div class="bg-gray-100 px-3 py-2 rounded-b-md flex items-center justify-between gap-3 min-h-12">
+        <div class="flex items-center gap-2">
+          <NcButton
+            v-if="!isPublic"
+            v-e="['c:row-expand:open']"
+            size="small"
+            class="!hover:(bg-white text-brand-500)"
+            type="secondary"
+            @click="addNewRecord"
+          >
+            <div class="flex items-center gap-1">
+              <MdiPlus v-if="!isMobileMode" class="h-4 w-4" /> {{ $t('activity.newRecord') }}
+            </div>
+          </NcButton>
+          <NcButton
+            v-if="!readOnly && (childrenListCount > 0 || (childrenList?.list ?? state?.[colTitle] ?? []).length > 0)"
+            v-e="['c:links:link']"
+            data-testid="nc-child-list-button-link-to"
+            class="!hover:(bg-white text-brand-500)"
+            size="small"
+            type="secondary"
+            @click="emit('attachRecord')"
+          >
+            <div class="flex items-center gap-1">
+              <GeneralIcon icon="link2" class="!xs:hidden h-4 w-4" />
+              {{ isMobileMode ? $t('title.linkMore') : $t('title.linkMoreRecords') }}
+            </div>
+          </NcButton>
+        </div>
+        <template v-if="!isNew && childrenList?.pageInfo && +childrenList.pageInfo.totalRows! > childrenListPagination.size">
+          <div class="flex justify-center items-center">
+            <NcPagination
+              v-model:current="childrenListPagination.page"
+              v-model:page-size="childrenListPagination.size"
+              :total="+childrenList.pageInfo.totalRows!"
+              mode="simple"
+            />
           </div>
-        </NcButton>
+        </template>
       </div>
     </div>
 
@@ -394,7 +470,15 @@ const onFilterChange = () => {
       <LazySmartsheetExpandedForm
         v-if="expandedFormRow && expandedFormDlg"
         v-model="expandedFormDlg"
+        :close-after-save="isExpandedFormCloseAfterSave"
         :meta="relatedTableMeta"
+        :new-record-header="
+          isExpandedFormCloseAfterSave
+            ? $t('activity.tableNameCreateNewRecord', {
+                tableName: relatedTableMeta?.title,
+              })
+            : undefined
+        "
         :row="{
           row: expandedFormRow,
           oldRow: expandedFormRow,
@@ -405,11 +489,13 @@ const onFilterChange = () => {
                   new: true,
                 },
         }"
+        :state="newRowState"
         :row-id="extractPkFromRow(expandedFormRow, relatedTableMeta.columns as ColumnType[])"
         use-meta-fields
+        @created-record="onCreatedRecord"
       />
     </Suspense>
-  </NcModal>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -420,10 +506,22 @@ const onFilterChange = () => {
 :deep(.ant-modal-content) {
   @apply !p-0;
 }
+
+:deep(.ant-skeleton-element .ant-skeleton-image) {
+  @apply !h-full;
+}
 </style>
 
 <style lang="scss">
-.nc-modal-child-list > .ant-modal > .ant-modal-content {
-  @apply !p-0;
+.nc-dropdown-link-record-search-wrapper {
+  .nc-search-icon {
+    @apply flex-none text-gray-500;
+  }
+
+  &:focus-within {
+    .nc-search-icon {
+      @apply text-gray-600;
+    }
+  }
 }
 </style>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
index c4b210e10a..26d1798ea4 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
@@ -16,19 +16,23 @@ import {
   useVModel,
 } from '#imports'
 import MaximizeIcon from '~icons/nc-icons/maximize'
-import LinkIcon from '~icons/nc-icons/link'
 
-const props = defineProps<{
-  row: any
-  fields: any[]
-  attachment: any
-  relatedTableDisplayValueProp: string
-  displayValueTypeAndFormatProp: { type: string; format: string }
-  isLoading: boolean
-  isLinked: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    row: any
+    fields: any[]
+    attachment: any
+    relatedTableDisplayValueProp: string
+    displayValueTypeAndFormatProp: { type: string; format: string }
+    isLoading: boolean
+    isLinked: boolean
+  }>(),
+  {
+    isLoading: false,
+  },
+)
 
-defineEmits(['expand'])
+defineEmits(['expand', 'linkOrUnlink'])
 
 provide(IsExpandedFormOpenInj, ref(true))
 
@@ -88,116 +92,198 @@ const displayValue = computed(() => {
 </script>
 
 <template>
-  <a-card
-    tabindex="0"
-    class="nc-list-item !outline-brand-500 !border-1 group transition-all !rounded-xl relative !mb-2 !border-gray-200 hover:bg-gray-50"
-    :class="{
-      '!bg-white': isLoading,
-      '!border-1': isLinked && !isLoading,
-      '!cursor-auto !hover:bg-white': readOnly,
-    }"
-    :body-style="{ padding: 0 }"
-    :hoverable="false"
-  >
-    <div class="flex flex-row items-center justify-start w-full">
-      <a-carousel v-if="attachment && attachments && attachments.length" autoplay class="!w-24 !h-24 !max-h-24 !max-w-24">
-        <template #customPaging> </template>
-        <template v-for="(attachmentObj, index) in attachments">
-          <LazyCellAttachmentImage
-            v-if="isImage(attachmentObj.title, attachmentObj.mimetype ?? attachmentObj.type)"
-            :key="`carousel-${attachmentObj.title}-${index}`"
-            class="!h-24 !w-24 !max-h-24 !max-w-24 object-cover !rounded-l-xl"
-            :srcs="getPossibleAttachmentSrc(attachmentObj)"
-          />
-        </template>
-      </a-carousel>
-      <div
-        v-else-if="attachment"
-        class="h-24 w-24 !min-h-24 !min-w-24 !max-h-24 !max-w-24 !flex flex-row items-center !rounded-l-xl justify-center"
-      >
-        <GeneralIcon class="w-full h-full !text-6xl !leading-10 !text-transparent rounded-lg" icon="fileImage" />
-      </div>
+  <div class="nc-list-item-wrapper group px-[1px] hover:bg-gray-50 border-y-1 border-gray-200 border-t-transparent">
+    <a-card
+      tabindex="0"
+      class="nc-list-item !outline-none transition-all relative group-hover:bg-gray-50 cursor-auto"
+      :class="{
+        '!bg-white': isLoading,
+        '!hover:bg-white': readOnly,
+      }"
+      :body-style="{ padding: '6px 10px !important', borderRadius: 0 }"
+      :hoverable="false"
+    >
+      <div class="flex items-center gap-3">
+        <div v-if="isLoading" class="flex">
+          <MdiLoading class="flex-none w-7 h-7 !text-brand-500 animate-spin" />
+        </div>
 
-      <div class="flex flex-col m-[.75rem] gap-1 flex-grow justify-center overflow-hidden">
-        <div class="flex justify-between xs:gap-x-2">
-          <span class="font-semibold text-brand-500 nc-display-value xs:(truncate)">
-            {{ displayValue }}
-          </span>
-          <div
-            v-if="isLinked && !isLoading"
-            class="text-brand-500 text-0.875"
+        <NcTooltip v-else class="z-10 flex">
+          <template #title> {{ isLinked ? 'Unlink' : 'Link' }}</template>
+
+          <button
+            tabindex="-1"
+            class="nc-list-item-link-unlink-btn p-1.5 flex rounded-lg transition-all"
             :class="{
-              '!group-hover:mr-12': fields.length === 0 && !readOnly,
+              'bg-red-100 text-red-500 hover:bg-red-200': isLinked,
+              'bg-green-100 text-green-500 hover:bg-green-200': !isLinked,
             }"
+            @click="$emit('linkOrUnlink')"
           >
-            <LinkIcon class="w-4 h-4" />
-            Linked
+            <GeneralIcon :icon="isLinked ? 'minus' : 'plus'" class="flex-none w-4 h-4 !font-extrabold" />
+          </button>
+        </NcTooltip>
+        <template v-if="attachment">
+          <div v-if="attachments && attachments.length">
+            <a-carousel autoplay class="!w-11 !h-11 !max-h-11 !max-w-11">
+              <template #customPaging> </template>
+              <template v-for="(attachmentObj, index) in attachments">
+                <LazyCellAttachmentImage
+                  v-if="isImage(attachmentObj.title, attachmentObj.mimetype ?? attachmentObj.type)"
+                  :key="`carousel-${attachmentObj.title}-${index}`"
+                  class="!w-11 !h-11 !max-h-11 !max-w-11object-cover !rounded-l-xl"
+                  :srcs="getPossibleAttachmentSrc(attachmentObj)"
+                />
+              </template>
+            </a-carousel>
           </div>
-          <MdiLoading
-            v-else-if="isLoading"
-            :class="{
-              '!group-hover:mr-8': fields.length === 0 && !readOnly,
-            }"
-            class="w-6 h-6 !text-brand-500 animate-spin"
-          />
-        </div>
+          <div
+            v-else
+            class="h-11 w-11 !min-h-11 !min-w-11 !max-h-11 !max-w-11 !flex flex-row items-center !rounded-l-xl justify-center"
+          >
+            <GeneralIcon class="w-full h-full !text-6xl !leading-10 !text-transparent rounded-lg" icon="fileImage" />
+          </div>
+        </template>
 
-        <div
-          v-if="fields.length > 0 && !isPublic && !isForm"
-          class="flex ml-[-0.25rem] sm:flex-row xs:(flex-col mt-2) gap-4 w-10/12"
-        >
-          <div v-for="field in fields" :key="field.id" :class="attachment ? 'sm:w-1/3' : 'sm:w-1/4'">
-            <div class="flex flex-col gap-[-1] max-w-72">
-              <LazySmartsheetHeaderVirtualCell
-                v-if="isVirtualCol(field)"
-                class="!scale-60"
-                :column="field"
-                :hide-menu="true"
-                :hide-icon="true"
-              />
-              <LazySmartsheetHeaderCell v-else class="!scale-70" :column="field" :hide-menu="true" :hide-icon="true" />
-
-              <div v-if="!isRowEmpty(row, field)">
-                <LazySmartsheetVirtualCell v-if="isVirtualCol(field)" v-model="row[field.title]" :row="row" :column="field" />
-                <LazySmartsheetCell
-                  v-else
-                  v-model="row[field.title]"
-                  class="!text-gray-600 ml-1"
-                  :column="field"
-                  :edit-enabled="false"
-                  :read-only="true"
-                />
+        <div class="flex-1 flex flex-col gap-1 justify-center overflow-hidden">
+          <div class="flex justify-start">
+            <span class="font-semibold text-brand-500 nc-display-value truncate leading-[20px]">
+              {{ displayValue }}
+            </span>
+          </div>
+
+          <div
+            v-if="fields.length > 0 && !isPublic && !isForm"
+            class="flex ml-[-0.25rem] sm:flex-row xs:(flex-col mt-2) gap-4 min-h-5"
+          >
+            <div v-for="field in fields" :key="field.id" class="sm:(w-1/3 max-w-1/3 overflow-hidden)">
+              <div v-if="!isRowEmpty(row, field)" class="flex flex-col gap-[-1]">
+                <NcTooltip class="z-10 flex" placement="bottom">
+                  <template #title>
+                    <LazySmartsheetHeaderVirtualCell
+                      v-if="isVirtualCol(field)"
+                      class="!scale-60 text-gray-100 !text-sm"
+                      :column="field"
+                      :hide-menu="true"
+                    />
+                    <LazySmartsheetHeaderCell v-else class="!scale-70 text-gray-100 !text-sm" :column="field" :hide-menu="true" />
+                  </template>
+                  <div class="nc-link-record-cell flex w-full max-w-full">
+                    <LazySmartsheetVirtualCell v-if="isVirtualCol(field)" v-model="row[field.title]" :row="row" :column="field" />
+                    <LazySmartsheetCell
+                      v-else
+                      v-model="row[field.title]"
+                      :column="field"
+                      :edit-enabled="false"
+                      :read-only="true"
+                    />
+                  </div>
+                </NcTooltip>
               </div>
-              <div v-else class="flex flex-row w-full h-[1.375rem] pl-1 items-center justify-start">-</div>
+              <div v-else class="flex flex-row w-full max-w-72 h-5 pl-1 items-center justify-start">-</div>
             </div>
           </div>
         </div>
+        <div v-if="!isForm && !isPublic && !readOnly" class="flex-none flex items-center w-7">
+          <button
+            v-e="['c:row-expand:open']"
+            :tabindex="-1"
+            class="z-10 flex items-center justify-center nc-expand-item !group-hover:visible !invisible !h-7 !w-7 transition-all !hover:children:(w-4.5 h-4.5)"
+            @click.stop="$emit('expand', row)"
+          >
+            <MaximizeIcon class="flex-none w-4 h-4 scale-125" />
+          </button>
+        </div>
       </div>
-    </div>
-    <NcButton
-      v-if="!isForm && !isPublic && !readOnly"
-      v-e="['c:row-expand:open']"
-      type="text"
-      size="medium"
-      class="!px-2 nc-expand-item !group-hover:block !hidden !border-1 !shadow-sm !border-gray-200 !bg-white !absolute right-3 bottom-3"
-      :class="{
-        '!group-hover:right-1.8 !group-hover:bottom-1.7': fields.length === 0,
-      }"
-      @click.stop="$emit('expand', row)"
-    >
-      <MaximizeIcon class="w-4 h-4" />
-    </NcButton>
-  </a-card>
+    </a-card>
+  </div>
 </template>
 
 <style lang="scss" scoped>
 :deep(.slick-list) {
   @apply rounded-lg;
 }
+.nc-list-item-link-unlink-btn {
+  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.06), 0px 5px 3px -2px rgba(0, 0, 0, 0.02);
+}
+
+.nc-link-record-cell {
+  :deep(.nc-cell),
+  :deep(.nc-virtual-cell) {
+    @apply !text-small !text-gray-600 ml-1;
+
+    .nc-cell-field,
+    .nc-cell-field-link,
+    input,
+    textarea {
+      @apply !text-small !p-0 m-0;
+    }
+
+    &:not(.nc-display-value-cell) {
+      @apply text-gray-600;
+      font-weight: 500;
+
+      .nc-cell-field,
+      input,
+      textarea {
+        @apply text-gray-600;
+        font-weight: 500;
+      }
+    }
+
+    .nc-cell-field,
+    a.nc-cell-field-link,
+    input,
+    textarea {
+      @apply !p-0 m-0;
+    }
+
+    &.nc-cell-longtext {
+      @apply leading-[18px];
+
+      textarea {
+        @apply pr-2;
+      }
+
+      .long-text-wrapper {
+        @apply !min-h-4;
+
+        .nc-rich-text-grid {
+          @apply pl-0 -ml-1;
+        }
+      }
+    }
+
+    .ant-picker-input {
+      @apply text-small leading-4;
+      font-weight: 500;
+
+      input {
+        @apply text-small leading-4;
+        font-weight: 500;
+      }
+    }
+
+    .ant-select:not(.ant-select-customize-input) {
+      .ant-select-selector {
+        @apply !border-none flex-nowrap pr-4.5;
+      }
+      .ant-select-arrow {
+        @apply right-[3px];
+      }
+    }
+  }
+}
 </style>
 
 <style lang="scss">
 .nc-list-item {
+  @apply border-1 border-transparent rounded-md;
+
+  &:focus-visible {
+    @apply border-brand-500;
+    box-shadow: 0 0 0 1px #3366ff;
+  }
   &:hover {
     .nc-text-area-expand-btn {
       @apply !hidden;
@@ -206,13 +292,14 @@ const displayValue = computed(() => {
   .long-text-wrapper {
     @apply select-none pointer-events-none;
     .nc-readonly-rich-text-wrapper {
-      @apply !min-h-6 !max-h-6;
+      @apply !min-h-5 !max-h-5;
     }
     .nc-rich-text-embed {
+      @apply -mt-0.5;
       .nc-textarea-rich-editor {
         @apply !overflow-hidden;
         .ProseMirror {
-          @apply !overflow-hidden line-clamp-1;
+          @apply !overflow-hidden line-clamp-1 h-[18px] pt-0.4;
         }
       }
     }
diff --git a/packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue b/packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue
index 7f21cdc8fb..b0f62408ef 100644
--- a/packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue
+++ b/packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue
@@ -14,9 +14,9 @@ import {
   useVModel,
 } from '#imports'
 
-const props = defineProps<{ modelValue: boolean; column: any }>()
+const props = defineProps<{ modelValue: boolean; column: any; hideBackBtn?: boolean }>()
 
-const emit = defineEmits(['update:modelValue', 'addNewRecord'])
+const emit = defineEmits(['update:modelValue', 'addNewRecord', 'attachLinkedRecord'])
 
 const vModel = useVModel(props, 'modelValue', emit)
 
@@ -50,7 +50,6 @@ const {
   meta,
   unlink,
   row,
-  headerDisplayValue,
   resetChildrenExcludedOffsetCount,
 } = useLTARStoreOrThrow()
 
@@ -66,6 +65,10 @@ const isForm = inject(IsFormInj, ref(false))
 
 const saveRow = inject(SaveRowInj, () => {})
 
+const reloadTrigger = inject(ReloadRowDataHookInj, createEventHook())
+
+const reloadViewDataTrigger = inject(ReloadViewDataHookInj, createEventHook())
+
 const linkRow = async (row: Record<string, any>, id: number) => {
   if (isNew.value) {
     addLTARRef(row, injectedColumn?.value as ColumnType)
@@ -100,7 +103,7 @@ watch(
       if (!isForm.value) {
         loadChildrenList()
       }
-      loadChildrenExcludedList(rowState.value)
+      loadChildrenExcludedList(rowState.value, true)
     }
     if (!nextVal) {
       resetChildrenExcludedOffsetCount()
@@ -157,13 +160,31 @@ const attachmentCol = computedInject(FieldsInj, (_fields) => {
 const fields = computedInject(FieldsInj, (_fields) => {
   return (relatedTableMeta.value.columns ?? [])
     .filter((col) => !isSystemColumn(col) && !isPrimary(col) && !isLinksOrLTAR(col) && !isAttachment(col))
-    .slice(0, isMobileMode.value ? 1 : 4)
+    .sort((a, b) => {
+      if (a.meta?.defaultViewColOrder !== undefined && b.meta?.defaultViewColOrder !== undefined) {
+        return a.meta.defaultViewColOrder - b.meta.defaultViewColOrder
+      }
+      return 0
+    })
+    .slice(0, isMobileMode.value ? 1 : 3)
 })
 
 const relation = computed(() => {
   return injectedColumn!.value?.colOptions?.type
 })
 
+const totalItemsToShow = computed(() => {
+  if (relation.value === 'bt') {
+    return row.value.row[relatedTableMeta.value?.title] ? 1 : 0
+  }
+
+  if (isForm.value || isNew.value) {
+    return rowState.value?.[injectedColumn!.value?.title]?.length ?? 0
+  }
+
+  return childrenListCount.value ?? 0
+})
+
 watch(expandedFormDlg, () => {
   if (!expandedFormDlg.value) {
     isExpandedFormCloseAfterSave.value = false
@@ -196,6 +217,15 @@ const addNewRecord = () => {
 }
 
 const onCreatedRecord = (record: any) => {
+  addLTARRef(record, injectedColumn?.value as ColumnType)
+
+  reloadTrigger?.trigger({
+    shouldShowLoading: false,
+  })
+  reloadViewDataTrigger?.trigger({
+    shouldShowLoading: false,
+  })
+
   const msgVNode = h(
     'div',
     {
@@ -223,6 +253,8 @@ const onCreatedRecord = (record: any) => {
   )
 
   message.success(msgVNode)
+
+  vModel.value = false
 }
 
 const linkedShortcuts = (e: KeyboardEvent) => {
@@ -253,6 +285,10 @@ watch(childrenExcludedListPagination, () => {
 
 onMounted(() => {
   window.addEventListener('keydown', linkedShortcuts)
+
+  setTimeout(() => {
+    filterQueryRef.value?.focus()
+  }, 100)
 })
 
 onUnmounted(() => {
@@ -268,154 +304,148 @@ const onFilterChange = () => {
 </script>
 
 <template>
-  <NcModal
-    v-model:visible="vModel"
-    :body-style="{ 'max-height': '640px', 'height': '85vh' }"
-    :class="{ active: vModel }"
-    :closable="false"
-    :footer="null"
-    :width="isForm ? 600 : 800"
-    wrap-class-name="nc-modal-link-record"
-  >
-    <LazyVirtualCellComponentsHeader
-      v-if="!isForm"
-      :display-value="headerDisplayValue"
-      :header="$t('activity.addNewLink')"
-      :related-table-title="relatedTableMeta?.title"
-      :relation="relation"
-      :table-title="meta?.title"
-    />
-    <div class="flex mt-2 mb-2 items-center gap-2">
-      <div class="flex items-center border-1 p-1 rounded-md w-full border-gray-200 !focus-within:border-primary">
-        <MdiMagnify class="w-5 h-5 ml-2 text-gray-500" />
-        <a-input
-          ref="filterQueryRef"
-          v-model:value="childrenExcludedListPagination.query"
-          :bordered="false"
-          :placeholder="`${$t('general.searchIn')} ${relatedTableMeta?.title}`"
-          class="w-full !rounded-md nc-excluded-search xs:min-h-8"
-          size="small"
-          @change="onFilterChange"
-          @keydown.capture.stop="
-            (e) => {
-              if (e.key === 'Escape') {
-                filterQueryRef?.blur()
-              }
-            }
-          "
-        >
-        </a-input>
-      </div>
-
-      <div class="flex-1" />
-
-      <!-- Add new record -->
-      <NcButton
-        v-if="!isPublic"
-        v-e="['c:row-expand:open']"
-        :size="isMobileMode ? 'medium' : 'small'"
-        class="!text-brand-500"
-        type="secondary"
-        @click="addNewRecord"
-      >
-        <div class="flex items-center gap-1 px-4"><MdiPlus v-if="!isMobileMode" /> {{ $t('activity.newRecord') }}</div>
-      </NcButton>
-    </div>
-
-    <template v-if="childrenExcludedList?.pageInfo?.totalRows">
-      <div ref="childrenExcludedListRef" class="overflow-scroll nc-scrollbar-md pr-1 cursor-pointer flex flex-col flex-grow">
-        <template v-if="isChildrenExcludedLoading">
-          <div
-            v-for="(_x, i) in Array.from({ length: 10 })"
-            :key="i"
-            class="!border-2 flex flex-row gap-2 mb-2 transition-all !rounded-xl relative !border-gray-200 hover:bg-gray-50"
+  <div class="nc-modal-link-record h-full w-full overflow-hidden" :class="{ active: vModel }" @keydown.enter.stop>
+    <div class="flex flex-col h-full">
+      <div class="nc-dropdown-link-record-header bg-gray-100 py-2 rounded-t-md flex justify-between pl-3 pr-2 gap-2">
+        <div class="flex-1 gap-2 flex items-center">
+          <button
+            v-if="!hideBackBtn"
+            class="!text-brand-500 hover:!text-brand-700 p-1.5 flex"
+            @click="emit('attachLinkedRecord')"
           >
-            <a-skeleton-image class="h-24 w-24 !rounded-xl" />
-            <div class="flex flex-col m-[.5rem] gap-2 flex-grow justify-center">
-              <a-skeleton-input active class="!xs:w-30 !w-48 !rounded-xl" size="small" />
-              <div class="flex flex-row gap-6 w-10/12">
-                <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
-                </div>
-                <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
-                </div>
-                <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
+            <GeneralIcon icon="ncArrowLeft" class="flex-none h-4 w-4" />
+          </button>
+
+          <div class="flex-1 nc-dropdown-link-record-search-wrapper flex items-center py-0.5 rounded-md">
+            <MdiMagnify class="nc-search-icon w-5 h-5" />
+            <a-input
+              ref="filterQueryRef"
+              v-model:value="childrenExcludedListPagination.query"
+              :bordered="false"
+              placeholder="Search records to link..."
+              class="w-full nc-excluded-search min-h-4"
+              size="small"
+              @change="onFilterChange"
+              @keydown.capture.stop="
+                (e) => {
+                  if (e.key === 'Escape') {
+                    filterQueryRef?.blur()
+                  }
+                }
+              "
+            >
+            </a-input>
+          </div>
+        </div>
+        <LazyVirtualCellComponentsHeader
+          data-testid="nc-link-count-info"
+          :linked-records="totalItemsToShow"
+          :related-table-title="relatedTableMeta?.title"
+          :relation="relation"
+          :table-title="meta?.title"
+        />
+      </div>
+      <div class="flex-1 overflow-auto nc-scrollbar-thin">
+        <template v-if="childrenExcludedList?.pageInfo?.totalRows">
+          <div ref="childrenExcludedListRef">
+            <template v-if="isChildrenExcludedLoading">
+              <div
+                v-for="(_x, i) in Array.from({ length: 10 })"
+                :key="i"
+                class="flex flex-row gap-2 mb-2 transition-all relative !border-gray-200 hover:bg-gray-50"
+              >
+                <div class="flex items-center">
+                  <a-skeleton-image class="h-14 w-14 !rounded-xl children:!h-full" />
                 </div>
-                <div class="flex flex-col gap-0.5">
-                  <a-skeleton-input active class="!h-4 !w-12" size="small" />
-                  <a-skeleton-input active class="!xs:hidden !h-4 !w-24" size="small" />
+                <div class="flex flex-col gap-2 flex-grow justify-center">
+                  <a-skeleton-input active class="h-3 !w-48 !rounded-xl" size="small" />
+                  <div class="flex flex-row gap-6 w-10/12">
+                    <div class="flex flex-col gap-0.5">
+                      <a-skeleton-input active class="!h-2 !w-12" size="small" />
+                      <a-skeleton-input active class="!h-2 !w-24" size="small" />
+                    </div>
+                    <div class="flex flex-col gap-0.5">
+                      <a-skeleton-input active class="!h-2 !w-12" size="small" />
+                      <a-skeleton-input active class="!h-2 !w-24" size="small" />
+                    </div>
+                    <div class="flex flex-col gap-0.5">
+                      <a-skeleton-input active class="!h-2 !w-12" size="small" />
+                      <a-skeleton-input active class="!h-2 !w-24" size="small" />
+                    </div>
+                  </div>
                 </div>
               </div>
-            </div>
+            </template>
+            <template v-else>
+              <LazyVirtualCellComponentsListItem
+                v-for="(refRow, id) in childrenExcludedList?.list ?? []"
+                :key="id"
+                :attachment="attachmentCol"
+                :display-value-type-and-format-prop="displayValueTypeAndFormatProp"
+                :fields="fields"
+                :is-linked="isChildrenExcludedListLinked[Number.parseInt(id)]"
+                :is-loading="isChildrenExcludedListLoading[Number.parseInt(id)]"
+                :related-table-display-value-prop="relatedTableDisplayValueProp"
+                :row="refRow"
+                data-testid="nc-excluded-list-item"
+                @link-or-unlink="onClick(refRow, id)"
+                @expand="
+                  () => {
+                    expandedFormRow = refRow
+                    expandedFormDlg = true
+                  }
+                "
+                @keydown.space.prevent.stop="() => onClick(refRow, id)"
+                @keydown.enter.prevent.stop="() => onClick(refRow, id)"
+              />
+            </template>
           </div>
         </template>
-        <template v-else>
-          <LazyVirtualCellComponentsListItem
-            v-for="(refRow, id) in childrenExcludedList?.list ?? []"
-            :key="id"
-            :attachment="attachmentCol"
-            :display-value-type-and-format-prop="displayValueTypeAndFormatProp"
-            :fields="fields"
-            :is-linked="isChildrenExcludedListLinked[Number.parseInt(id)]"
-            :is-loading="isChildrenExcludedListLoading[Number.parseInt(id)]"
-            :related-table-display-value-prop="relatedTableDisplayValueProp"
-            :row="refRow"
-            data-testid="nc-excluded-list-item"
-            @click="() => onClick(refRow, id)"
-            @expand="
-              () => {
-                expandedFormRow = refRow
-                expandedFormDlg = true
-              }
-            "
-            @keydown.space.prevent="() => onClick(refRow, id)"
-            @keydown.enter.prevent="() => onClick(refRow, id)"
-          />
-        </template>
-      </div>
-    </template>
-    <div v-else class="my-auto py-2 flex flex-col gap-3 items-center justify-center text-gray-500">
-      <InboxIcon class="w-16 h-16 mx-auto" />
-      <p>
-        {{ $t('msg.thereAreNoRecordsInTable') }}
-        {{ relatedTableMeta?.title }}
-      </p>
-    </div>
-
-    <div v-if="isMobileMode" class="flex flex-row justify-center items-center w-full my-2">
-      <NcPagination
-        v-if="childrenExcludedList?.pageInfo"
-        v-model:current="childrenExcludedListPagination.page"
-        v-model:page-size="childrenExcludedListPagination.size"
-        :total="+childrenExcludedList?.pageInfo?.totalRows"
-        entity-name="links-excluded-list"
-      />
-    </div>
-
-    <div class="mb-2 bg-gray-50 border-gray-50 border-b-2"></div>
-
-    <div class="flex flex-row justify-between items-center bg-white relative pt-1">
-      <div v-if="!isForm" class="flex items-center justify-center px-2 rounded-md text-gray-500 bg-brand-50 h-9.5">
-        {{ relation === 'bt' ? (row.row[relatedTableMeta?.title] ? '1' : 0) : childrenListCount ?? 'No' }}
-        {{ !isMobileMode ? $t('objects.records') : '' }} {{ !isMobileMode && childrenListCount !== 0 ? 'are' : '' }}
-        {{ $t('general.linked') }}
+        <div v-else class="h-full my-auto py-2 flex flex-col gap-3 items-center justify-center text-gray-500">
+          <InboxIcon class="w-16 h-16 mx-auto" />
+          <p>
+            {{ $t('msg.thereAreNoRecordsInTable') }}
+            {{ relatedTableMeta?.title }}
+          </p>
+        </div>
       </div>
-      <div class="!xs:hidden flex absolute -mt-0.75 items-center py-2 justify-center w-full">
-        <NcPagination
-          v-if="childrenExcludedList?.pageInfo"
-          v-model:current="childrenExcludedListPagination.page"
-          v-model:page-size="childrenExcludedListPagination.size"
-          :total="+childrenExcludedList?.pageInfo?.totalRows"
-          entity-name="links-excluded-list"
-          mode="simple"
-        />
+      <div class="bg-gray-100 px-3 py-2 rounded-b-md flex items-center justify-between min-h-12">
+        <div class="flex">
+          <NcButton
+            v-if="!isPublic"
+            v-e="['c:row-expand:open']"
+            size="small"
+            class="!hover:(bg-white text-brand-500)"
+            type="secondary"
+            @click="addNewRecord"
+          >
+            <div class="flex items-center gap-1"><MdiPlus v-if="!isMobileMode" /> {{ $t('activity.newRecord') }}</div>
+          </NcButton>
+        </div>
+        <template
+          v-if="
+            childrenExcludedList?.pageInfo && +childrenExcludedList?.pageInfo?.totalRows > childrenExcludedListPagination.size
+          "
+        >
+          <div v-if="isMobileMode" class="flex items-center">
+            <NcPagination
+              v-model:current="childrenExcludedListPagination.page"
+              v-model:page-size="childrenExcludedListPagination.size"
+              :total="+childrenExcludedList?.pageInfo?.totalRows"
+              entity-name="links-excluded-list"
+            />
+          </div>
+          <div v-else class="flex items-center">
+            <NcPagination
+              v-model:current="childrenExcludedListPagination.page"
+              v-model:page-size="childrenExcludedListPagination.size"
+              :total="+childrenExcludedList?.pageInfo?.totalRows"
+              entity-name="links-excluded-list"
+              mode="simple"
+            />
+          </div>
+        </template>
       </div>
-      <NcButton class="nc-close-btn ml-auto" type="ghost" @click="vModel = false"> {{ $t('general.finish') }} </NcButton>
     </div>
     <Suspense>
       <LazySmartsheetExpandedForm
@@ -443,14 +473,29 @@ const onFilterChange = () => {
         :row-id="extractPkFromRow(expandedFormRow, relatedTableMeta.columns as ColumnType[])"
         :state="newRowState"
         use-meta-fields
+        :skip-reload="true"
         @created-record="onCreatedRecord"
       />
     </Suspense>
-  </NcModal>
+  </div>
 </template>
 
+<style lang="scss" scoped>
+:deep(.ant-skeleton-element .ant-skeleton-image) {
+  @apply !h-full;
+}
+</style>
+
 <style lang="scss">
-.nc-modal-link-record > .ant-modal > .ant-modal-content {
-  @apply !p-0;
+.nc-dropdown-link-record-search-wrapper {
+  .nc-search-icon {
+    @apply flex-none text-gray-500;
+  }
+
+  &:focus-within {
+    .nc-search-icon {
+      @apply text-gray-600;
+    }
+  }
 }
 </style>
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 7362d977a4..7d1848b159 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -1,6 +1,10 @@
 <script lang="ts" setup>
-import { OrderedWorkspaceRoles, WorkspaceUserRoles, parseStringDateTime, timeAgo } from 'nocodb-sdk'
-import { storeToRefs, useUserSorts, useWorkspace } from '#imports'
+import { OrderedWorkspaceRoles, WorkspaceUserRoles } from 'nocodb-sdk'
+import { IsAdminPanelInj, storeToRefs, useUserSorts, useWorkspace } from '#imports'
+
+const props = defineProps<{
+  workspaceId?: string
+}>()
 
 const { workspaceRoles, loadRoles } = useRoles()
 
@@ -8,12 +12,22 @@ const workspaceStore = useWorkspace()
 
 const { removeCollaborator, updateCollaborator: _updateCollaborator } = workspaceStore
 
-const { collaborators, workspaceRole } = storeToRefs(workspaceStore)
+const { collaborators, activeWorkspace: _activeWorkspace, workspaces } = storeToRefs(workspaceStore)
+
+const currentWorkspace = computed(() => {
+  return props.workspaceId ? workspaces.value.get(props.workspaceId) : _activeWorkspace.value
+})
 
 const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = useUserSorts('Workspace')
 
 const userSearchText = ref('')
 
+const isAdminPanel = inject(IsAdminPanelInj, ref(false))
+
+const { isUIAllowed } = useRoles()
+
+const inviteDlg = ref(false)
+
 const filterCollaborators = computed(() => {
   if (!userSearchText.value) return collaborators.value ?? []
 
@@ -26,13 +40,34 @@ const filterCollaborators = computed(() => {
   )
 })
 
+const selected = reactive<{
+  [key: number]: boolean
+}>({})
+
+const toggleSelectAll = (value: boolean) => {
+  filterCollaborators.value.forEach((_, i) => {
+    selected[i] = value
+  })
+}
+
 const sortedCollaborators = computed(() => {
   return handleGetSortedData(filterCollaborators.value, sorts.value)
 })
 
+const selectAll = computed({
+  get: () =>
+    Object.values(selected).every((v) => v) &&
+    Object.keys(selected).length > 0 &&
+    Object.values(selected).length === sortedCollaborators.value.length,
+  set: (value) => {
+    toggleSelectAll(value)
+  },
+})
+
 const updateCollaborator = async (collab: any, roles: WorkspaceUserRoles) => {
   try {
-    await _updateCollaborator(collab.id, roles)
+    console.log()
+    await _updateCollaborator(collab.id, roles, currentWorkspace.value.id)
     message.success('Successfully updated user role')
 
     collaborators.value?.forEach((collaborator) => {
@@ -54,81 +89,89 @@ const accessibleRoles = computed<WorkspaceUserRoles[]>(() => {
 })
 
 onMounted(async () => {
-  await loadRoles()
+  await loadRoles(null, {}, currentWorkspace.value?.id)
   loadSorts()
 })
 </script>
 
 <template>
-  <div class="nc-collaborator-table-container mt-4 mx-6 h-[calc(100vh-12rem)]">
-    <div class="w-full flex justify-between items-baseline mt-6.5 mb-2 pr-0.25 ml-2">
-      <div class="text-xl">Invite Members By Email</div>
+  <DlgInviteDlg v-model:model-value="inviteDlg" :workspace-id="currentWorkspace.id" type="workspace" />
+  <div class="nc-collaborator-table-container mt-4 h-[calc(100vh-10rem)]">
+    <div class="w-full flex justify-between mt-6.5 mb-2">
       <a-input v-model:value="userSearchText" class="!max-w-90 !rounded-md mr-4" placeholder="Search members">
         <template #prefix>
           <PhMagnifyingGlassBold class="!h-3.5 text-gray-500" />
         </template>
       </a-input>
+      <NcButton data-testid="nc-add-member-btn" @click="inviteDlg = true">
+        <div class="flex items-center gap-2">
+          <component :is="iconMap.plus" class="!h-4 !w-4" />
+          {{ $t('labels.addMember') }}
+        </div>
+      </NcButton>
     </div>
-    <WorkspaceInviteSection v-if="workspaceRole !== WorkspaceUserRoles.VIEWER" />
     <div v-if="!filterCollaborators?.length" class="w-full h-full flex flex-col items-center justify-center mt-36">
       <a-empty description="No members found" />
     </div>
     <div v-else class="nc-collaborators-list mt-6 h-full">
-      <div class="flex flex-col rounded-lg overflow-hidden border-1 max-w-350 max-h-[calc(100%-8rem)]">
-        <div class="flex flex-row bg-gray-50 min-h-12 items-center">
-          <div class="text-gray-700 users-email-grid w-3/8 ml-10 mr-3 flex items-center space-x-2">
+      <div class="flex flex-col rounded-lg overflow-hidden border-1 max-w-350 max-h-[calc(100%-4rem)]">
+        <div class="flex flex-row bg-gray-50 min-h-11 items-center border-b-1">
+          <div class="py-3 px-6"><NcCheckbox v-model:checked="selectAll" /></div>
+          <div class="text-gray-700 w-[30rem] users-email-grid flex items-center space-x-2">
             <span>
               {{ $t('objects.users') }}
             </span>
-            <LazyAccountUserMenu :direction="sortDirection.email" field="email" :handle-user-sort="saveOrUpdate" />
+            <LazyAccountUserMenu :direction="sortDirection.email" :handle-user-sort="saveOrUpdate" field="email" />
           </div>
-          <div class="text-gray-700 user-access-grid w-2/8 mr-3 flex items-center space-x-2">
+          <div class="text-gray-700 w-full flex-1 px-6 py-3 flex items-center space-x-2">
             <span>
               {{ $t('general.access') }}
             </span>
             <LazyAccountUserMenu :direction="sortDirection.roles" field="roles" :handle-user-sort="saveOrUpdate" />
           </div>
-          <div class="text-gray-700 date-joined-grid w-2/8 mr-3">{{ $t('title.dateJoined') }}</div>
-          <div class="text-gray-700 user-access-grid w-1/8">Actions</div>
+          <div class="text-gray-700 w-full flex-1 px-6 py-3">{{ $t('title.dateJoined') }}</div>
+          <div class="text-gray-700 w-full text-right flex-1 px-6 py-3">{{ $t('labels.actions') }}</div>
         </div>
-
         <div class="flex flex-col nc-scrollbar-md">
           <div
             v-for="(collab, i) of sortedCollaborators"
             :key="i"
-            class="flex flex-row border-b-1 py-1 min-h-14 items-center justify-around last"
+            class="user-row flex hover:bg-gray-50 flex-row last:border-b-0 border-b-1 py-1 min-h-14 items-center"
           >
-            <div class="flex gap-3 items-center users-email-grid w-3/8 ml-10">
-              <GeneralUserIcon size="base" :name="collab.email" :email="collab.email" />
-              <NcTooltip v-if="collab.display_name">
-                <template #title>
+            <div class="py-3 px-6">
+              <NcCheckbox v-model:checked="selected[i]" />
+            </div>
+
+            <div class="flex gap-3 w-[30rem] items-center users-email-grid">
+              <GeneralUserIcon :email="collab.email" size="base" />
+              <div class="flex flex-col">
+                <div class="flex gap-3">
+                  <span class="text-gray-800 capitalize font-semibold">
+                    {{ collab.display_name || collab.email.slice(0, collab.email.indexOf('@')) }}
+                  </span>
+                </div>
+                <span class="text-xs text-gray-600">
                   {{ collab.email }}
-                </template>
-                <span class="truncate">
-                  {{ collab.display_name }}
                 </span>
-              </NcTooltip>
-              <span v-else class="truncate">
-                {{ collab.email }}
-              </span>
+              </div>
             </div>
-            <div class="user-access-grid w-2/8">
-              <template v-if="accessibleRoles.includes(collab.roles)">
-                <div class="w-[30px]">
+            <div class="w-full flex-1 px-6 py-3">
+              <div class="w-[30px]">
+                <template v-if="accessibleRoles.includes(collab.roles)">
                   <RolesSelector
+                    :description="false"
+                    :on-role-change="(role) => updateCollaborator(collab, role)"
                     :role="collab.roles"
                     :roles="accessibleRoles"
-                    :description="false"
                     class="cursor-pointer"
-                    :on-role-change="(role) => updateCollaborator(collab, role)"
                   />
-                </div>
-              </template>
-              <template v-else>
-                <RolesBadge :role="collab.roles" class="cursor-default" />
-              </template>
+                </template>
+                <template v-else>
+                  <RolesBadge :border="false" :role="collab.roles" class="cursor-default" />
+                </template>
+              </div>
             </div>
-            <div class="date-joined-grid w-2/8 flex justify-start">
+            <div class="w-full flex-1 px-6 py-3">
               <NcTooltip class="max-w-full">
                 <template #title>
                   {{ parseStringDateTime(collab.created_at) }}
@@ -138,14 +181,35 @@ onMounted(async () => {
                 </span>
               </NcTooltip>
             </div>
-            <div class="w-1/8 pl-6">
-              <NcDropdown v-if="collab.roles !== WorkspaceUserRoles.OWNER" :trigger="['click']">
-                <MdiDotsVertical
-                  class="border-1 !text-gray-600 h-5.5 w-5.5 rounded outline-0 p-0.5 nc-workspace-menu transform transition-transform !text-gray-400 cursor-pointer hover:(!text-gray-500 bg-gray-100)"
-                />
+            <div class="w-full justify-end flex-1 flex px-6 py-3">
+              <NcDropdown v-if="collab.roles !== WorkspaceUserRoles.OWNER">
+                <NcButton size="small" type="secondary">
+                  <component :is="iconMap.threeDotVertical" />
+                </NcButton>
                 <template #overlay>
                   <NcMenu>
-                    <NcMenuItem class="!text-red-500 !hover:bg-red-50" @click="removeCollaborator(collab.id)">
+                    <template v-if="isAdminPanel">
+                      <NcMenuItem data-testid="nc-admin-org-user-delete">
+                        <GeneralIcon class="text-gray-800" icon="signout" />
+                        <span>{{ $t('labels.signOutUser') }}</span>
+                      </NcMenuItem>
+
+                      <a-menu-divider class="my-1.5" />
+                    </template>
+                    <NcMenuItem
+                      v-if="isUIAllowed('transferWorkspaceOwnership')"
+                      data-testid="nc-admin-org-user-assign-admin"
+                      @click="updateCollaborator(collab, WorkspaceUserRoles.OWNER)"
+                    >
+                      <GeneralIcon class="text-gray-800" icon="user" />
+                      <span>{{ $t('labels.assignAs') }}</span>
+                      <RolesBadge :border="false" :show-icon="false" role="owner" />
+                    </NcMenuItem>
+
+                    <NcMenuItem
+                      class="!text-red-500 !hover:bg-red-50"
+                      @click="removeCollaborator(collab.id, currentWorkspace.id)"
+                    >
                       <MaterialSymbolsDeleteOutlineRounded />
                       Remove user
                     </NcMenuItem>
@@ -154,15 +218,15 @@ onMounted(async () => {
               </NcDropdown>
             </div>
           </div>
-          <div v-if="sortedCollaborators.length === 1" class="pt-12 pb-4 px-2 flex flex-col items-center gap-6 text-center">
-            <div class="text-2xl text-gray-800 font-bold">
-              {{ $t('placeholder.inviteYourTeam') }}
-            </div>
-            <div class="text-sm text-gray-700">
-              {{ $t('placeholder.inviteYourTeamLabel') }}
-            </div>
-            <img src="~assets/img/placeholder/invite-team.png" class="!w-[30rem] flex-none" />
+        </div>
+        <div v-if="sortedCollaborators.length === 1" class="pt-12 pb-4 px-2 flex flex-col items-center gap-6 text-center">
+          <div class="text-2xl text-gray-800 font-bold">
+            {{ $t('placeholder.inviteYourTeam') }}
+          </div>
+          <div class="text-sm text-gray-700">
+            {{ $t('placeholder.inviteYourTeamLabel') }}
           </div>
+          <img alt="Invite Team" class="!w-[30rem] flex-none" src="~assets/img/placeholder/invite-team.png" />
         </div>
       </div>
     </div>
@@ -170,6 +234,18 @@ onMounted(async () => {
 </template>
 
 <style scoped lang="scss">
+.ant-input::placeholder {
+  @apply text-gray-500;
+}
+
+.ant-input:placeholder-shown {
+  @apply text-gray-500 !text-md;
+}
+
+.ant-input-affix-wrapper {
+  @apply px-4 rounded-lg py-2 w-84 border-1 focus:border-brand-500 border-gray-200 !ring-0;
+}
+
 .badge-text {
   @apply text-[14px] pt-1 text-center;
 }
diff --git a/packages/nc-gui/components/workspace/Settings.vue b/packages/nc-gui/components/workspace/Settings.vue
index da1f0f1661..01120ff29c 100644
--- a/packages/nc-gui/components/workspace/Settings.vue
+++ b/packages/nc-gui/components/workspace/Settings.vue
@@ -1,13 +1,17 @@
 <script lang="ts" setup>
 import { ref, storeToRefs, useGlobal, useI18n, useWorkspace, watch } from '#imports'
 
+const props = defineProps<{
+  workspaceId?: string
+}>()
+
 const { signOut } = useGlobal()
 
 const { t } = useI18n()
 
 const { deleteWorkspace, navigateToWorkspace, updateWorkspace } = useWorkspace()
 
-const { workspacesList, activeWorkspaceId, activeWorkspace, workspaces } = storeToRefs(useWorkspace())
+const { workspacesList, activeWorkspace, workspaces } = storeToRefs(useWorkspace())
 
 const formValidator = ref()
 
@@ -33,19 +37,29 @@ const formRules = {
   ],
 }
 
+const currentWorkspace = computed(() => {
+  return props.workspaceId ? workspaces.value.get(props.workspaceId) : activeWorkspace.value
+})
+
 const onDelete = async () => {
   isDeleting.value = true
   try {
-    await deleteWorkspace(activeWorkspaceId.value, { skipStateUpdate: true })
+    await deleteWorkspace(currentWorkspace.value.id, { skipStateUpdate: true })
 
     isConfirmed.value = false
     isDeleting.value = false
 
     // We only remove the delete workspace from the list after the api call is successful
-    workspaces.value.delete(activeWorkspaceId.value)
+    workspaces.value.delete(currentWorkspace.value.id)
 
     if (workspacesList.value.length > 1) {
-      await navigateToWorkspace(workspacesList.value[0].id)
+      // WorkspaceId is provided from the admin Panel. If deleted navigate to the workspace list page
+      if (!props.workspaceId) {
+        await navigateToWorkspace(workspacesList.value[0].id)
+      } else {
+        // #TODO: @DarkPhoenix2704
+        // Navigate BackPage
+      }
     } else {
       // As signin page will clear the workspaces, we need to check if there are more than one workspace
       await signOut(false)
@@ -69,7 +83,7 @@ const titleChange = async () => {
   isErrored.value = false
 
   try {
-    await updateWorkspace(activeWorkspaceId.value, {
+    await updateWorkspace(currentWorkspace.value.id, {
       title: form.value.title,
     })
   } catch (e: any) {
@@ -81,9 +95,9 @@ const titleChange = async () => {
 }
 
 watch(
-  () => activeWorkspace.value.title,
+  () => currentWorkspace.value.id,
   () => {
-    form.value.title = activeWorkspace.value.title
+    form.value.title = currentWorkspace.value.title
   },
   {
     immediate: true,
@@ -94,11 +108,7 @@ watch(
   () => form.value.title,
   async () => {
     try {
-      if (form.value.title !== activeWorkspace.value?.title) {
-        isCancelButtonVisible.value = true
-      } else {
-        isCancelButtonVisible.value = false
-      }
+      isCancelButtonVisible.value = form.value.title !== currentWorkspace.value?.title
       isErrored.value = !(await formValidator.value.validate())
     } catch (e: any) {
       isErrored.value = true
@@ -107,7 +117,7 @@ watch(
 )
 
 const onCancel = () => {
-  form.value.title = activeWorkspace.value?.title
+  form.value.title = currentWorkspace.value?.title
 }
 </script>
 
@@ -140,7 +150,7 @@ const onCancel = () => {
             v-e="['c:workspace:settings:rename']"
             type="primary"
             html-type="submit"
-            :disabled="isErrored || (form.title && form.title === activeWorkspace.title)"
+            :disabled="isErrored || (form.title && form.title === currentWorkspace.title)"
             :loading="isDeleting"
             data-testid="nc-workspace-settings-settings-rename-submit"
           >
@@ -175,7 +185,7 @@ const onCancel = () => {
 </template>
 
 <style lang="scss" scoped>
-.item {
+.item-card {
   @apply p-6 rounded-2xl border-1 max-w-180 mt-10 min-w-100 w-full;
 }
 </style>
diff --git a/packages/nc-gui/components/workspace/View.vue b/packages/nc-gui/components/workspace/View.vue
index 50750cf56a..d5f25a9254 100644
--- a/packages/nc-gui/components/workspace/View.vue
+++ b/packages/nc-gui/components/workspace/View.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup>
 import { useTitle } from '@vueuse/core'
+import { storeToRefs } from '#imports'
+
+const props = defineProps<{
+  workspaceId?: string
+}>()
 
 const router = useRouter()
 const route = router.currentRoute
@@ -7,21 +12,38 @@ const route = router.currentRoute
 const { isUIAllowed } = useRoles()
 
 const workspaceStore = useWorkspace()
-const { activeWorkspace, workspaces } = storeToRefs(workspaceStore)
-const { loadCollaborators } = workspaceStore
+const { activeWorkspace: _activeWorkspace, workspaces } = storeToRefs(workspaceStore)
+const { loadCollaborators, loadWorkspace } = workspaceStore
+
+const orgStore = useOrg()
+const { orgId } = storeToRefs(orgStore)
+
+const currentWorkspace = computedAsync(async () => {
+  let ws
+  if (props.workspaceId) {
+    ws = workspaces.value.get(props.workspaceId)
+    if (!ws) {
+      await loadWorkspace(props.workspaceId)
+      ws = workspaces.value.get(props.workspaceId)
+    }
+  } else {
+    ws = _activeWorkspace.value
+  }
+  return ws
+})
 
 const tab = computed({
   get() {
     return route.value.query?.tab ?? 'collaborators'
   },
   set(tab: string) {
-    if (tab === 'collaborators') loadCollaborators()
+    if (tab === 'collaborators') loadCollaborators({} as any, props.workspaceId)
     router.push({ query: { ...route.value.query, tab } })
   },
 })
 
 watch(
-  () => activeWorkspace.value?.title,
+  () => currentWorkspace.value?.title,
   (title: string) => {
     if (!title) return
 
@@ -35,26 +57,40 @@ watch(
 )
 
 onMounted(() => {
-  until(() => activeWorkspace.value?.id)
+  until(() => currentWorkspace.value?.id)
     .toMatch((v) => !!v)
-    .then(() => {
-      until(() => workspaces.value)
-        .toMatch((v) => v.has(activeWorkspace.value.id))
-        .then(() => {
-          loadCollaborators()
-        })
+    .then(async () => {
+      await loadCollaborators({} as any, currentWorkspace.value.id)
     })
 })
 </script>
 
 <template>
-  <div v-if="activeWorkspace" class="flex flex-col nc-workspace-settings">
-    <div class="flex gap-2 items-center min-w-0 p-6">
-      <GeneralWorkspaceIcon :workspace="activeWorkspace" />
-      <h1 class="text-3xl font-weight-bold tracking-[0.5px] mb-0 nc-workspace-title truncate min-w-10 capitalize">
-        {{ activeWorkspace?.title }}
+  <div v-if="currentWorkspace" class="flex w-full px-6 max-w-[97.5rem] flex-col nc-workspace-settings">
+    <div v-if="!props.workspaceId" class="flex gap-2 items-center min-w-0 py-6">
+      <GeneralWorkspaceIcon :workspace="currentWorkspace" />
+      <h1 class="text-3xl capitalize font-weight-bold tracking-[0.5px] mb-0 nc-workspace-title truncate min-w-10 capitalize">
+        {{ currentWorkspace?.title }}
       </h1>
     </div>
+    <div v-else>
+      <div class="font-bold w-full !mb-5 text-2xl" data-rec="true">
+        <div class="flex items-center gap-3">
+          <NuxtLink
+            :href="`/admin/${orgId}/workspaces`"
+            class="!hover:(text-black underline-gray-600) !text-black !underline-transparent ml-0.75 max-w-1/4"
+          >
+            {{ $t('labels.workspaces') }}
+          </NuxtLink>
+
+          <span class="text-2xl"> / </span>
+          <GeneralWorkspaceIcon :workspace="currentWorkspace" hide-label />
+          <span class="text-base capitalize">
+            {{ currentWorkspace?.title }}
+          </span>
+        </div>
+      </div>
+    </div>
 
     <NcTabs v-model:activeKey="tab">
       <template v-if="isUIAllowed('workspaceSettings')">
@@ -65,7 +101,7 @@ onMounted(() => {
               Members
             </div>
           </template>
-          <WorkspaceCollaboratorsList />
+          <WorkspaceCollaboratorsList :workspace-id="currentWorkspace.id" />
         </a-tab-pane>
       </template>
 
@@ -77,7 +113,7 @@ onMounted(() => {
               Settings
             </div>
           </template>
-          <WorkspaceSettings />
+          <WorkspaceSettings :workspace-id="currentWorkspace.id" />
         </a-tab-pane>
       </template>
     </NcTabs>
@@ -90,7 +126,24 @@ onMounted(() => {
   font-size: 0.7rem;
 }
 
+.tab {
+  @apply flex flex-row items-center gap-x-2;
+}
+
+:deep(.ant-tabs-nav) {
+  @apply !pl-0;
+}
+
 :deep(.ant-tabs-nav-list) {
-  @apply !ml-3;
+  @apply !gap-5;
+}
+:deep(.ant-tabs-tab) {
+  @apply !pt-0 !pb-2.5 !ml-0;
+}
+.ant-tabs-content {
+  @apply !h-full;
+}
+.ant-tabs-content-top {
+  @apply !h-full;
 }
 </style>
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 7cb365ae98..e91ea70a8c 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -738,7 +738,8 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
     watch(activeCalendarView, async (value, oldValue) => {
       if (oldValue === 'week') {
         pageDate.value = selectedDate.value
-        selectedMonth.value = selectedDate.value ?? selectedDateRange.value.start
+        selectedMonth.value = selectedTime.value ?? selectedDate.value ?? selectedDateRange.value.start
+        selectedDate.value = selectedTime.value ?? selectedDateRange.value.start
         selectedTime.value = selectedDate.value ?? selectedDateRange.value.start
       } else if (oldValue === 'month') {
         selectedDate.value = selectedMonth.value
diff --git a/packages/nc-gui/composables/useData.ts b/packages/nc-gui/composables/useData.ts
index a287042292..959fc7d813 100644
--- a/packages/nc-gui/composables/useData.ts
+++ b/packages/nc-gui/composables/useData.ts
@@ -477,8 +477,8 @@ export function useData(args: {
     try {
       await $api.dbTableRow.nestedAdd(
         NOCO,
-        base.value.title as string,
-        metaValue?.title as string,
+        base.value.id as string,
+        metaValue?.id as string,
         encodeURIComponent(rowId),
         type as RelationTypes,
         column.title as string,
@@ -630,23 +630,25 @@ export function useData(args: {
 
   async function deleteSelectedRows() {
     let row = formattedData.value.length
-    let removedRowsData: Record<string, any>[] = []
+    const removedRowsData: Record<string, any>[] = []
     let compositePrimaryKey = ''
 
     while (row--) {
-      const { row: rowObj, rowMeta } = formattedData.value[row] as Record<string, any>
+      const { row: rowData, rowMeta } = formattedData.value[row] as Record<string, any>
       if (!rowMeta.selected) {
         continue
       }
       if (!rowMeta.new) {
         const extractedPk = extractPk(meta?.value?.columns as ColumnType[])
-        const compositePkValue = extractPkFromRow(rowObj, meta?.value?.columns as ColumnType[])
+        const compositePkValue = extractPkFromRow(rowData, meta?.value?.columns as ColumnType[])
+        const pkData = rowPkData(rowData, meta?.value?.columns as ColumnType[])
 
         if (extractedPk && compositePkValue) {
           if (!compositePrimaryKey) compositePrimaryKey = extractedPk
 
           removedRowsData.push({
             [compositePrimaryKey]: compositePkValue as string,
+            pkData,
             row: clone(formattedData.value[row]) as Row,
             rowIndex: row as number,
           })
@@ -670,20 +672,7 @@ export function useData(args: {
         rowObj.row = clone(fullRecord)
       }
 
-      const removedRowIds: Record<string, any>[] = await bulkDeleteRows(
-        removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
-      )
-
-      if (Array.isArray(removedRowIds)) {
-        const removedRowsDataSet = new Set(removedRowIds.map((row) => row[compositePrimaryKey]))
-
-        removedRowsData = removedRowsData.filter((row) => removedRowsDataSet.has(row[compositePrimaryKey] as string))
-
-        const rowIndexesSet = new Set(removedRowsData.map((row) => row.rowIndex))
-        formattedData.value = formattedData.value.filter((_, index) => rowIndexesSet.has(index))
-      } else {
-        removedRowsData = []
-      }
+      await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
     } catch (e: any) {
       return message.error(`${t('msg.error.deleteRowFailed')}: ${await extractSdkResponseErrorMsg(e)}`)
     }
@@ -692,10 +681,8 @@ export function useData(args: {
 
     addUndo({
       redo: {
-        fn: async function redo(this: UndoRedoAction, removedRowsData: Record<string, any>[], compositePrimaryKey: string) {
-          const removedRowIds = await bulkDeleteRows(
-            removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
-          )
+        fn: async function redo(this: UndoRedoAction, removedRowsData: Record<string, any>[]) {
+          const removedRowIds = await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
 
           if (Array.isArray(removedRowIds)) {
             for (const { row } of removedRowsData) {
@@ -708,7 +695,7 @@ export function useData(args: {
 
           await callbacks?.syncPagination?.()
         },
-        args: [removedRowsData, compositePrimaryKey],
+        args: [removedRowsData],
       },
       undo: {
         fn: async function undo(
@@ -764,22 +751,24 @@ export function useData(args: {
     // plus one because we want to include the end row
     let row = start + 1
 
-    let removedRowsData: Record<string, any>[] = []
+    const removedRowsData: Record<string, any>[] = []
     let compositePrimaryKey = ''
 
     while (row--) {
       try {
-        const { row: rowObj, rowMeta } = formattedData.value[row] as Record<string, any>
+        const { row: rowData, rowMeta } = formattedData.value[row] as Record<string, any>
 
         if (!rowMeta.new) {
           const extractedPk = extractPk(meta?.value?.columns as ColumnType[])
-          const compositePkValue = extractPkFromRow(rowObj, meta?.value?.columns as ColumnType[])
+          const compositePkValue = extractPkFromRow(rowData, meta?.value?.columns as ColumnType[])
+          const pkData = rowPkData(rowData, meta?.value?.columns as ColumnType[])
 
           if (extractedPk && compositePkValue) {
             if (!compositePrimaryKey) compositePrimaryKey = extractedPk
 
             removedRowsData.push({
               [compositePrimaryKey]: compositePkValue as string,
+              pkData,
               row: clone(formattedData.value[row]) as Row,
               rowIndex: row as number,
             })
@@ -808,20 +797,7 @@ export function useData(args: {
         rowObj.row = clone(fullRecord)
       }
 
-      const removedRowIds: Record<string, any>[] = await bulkDeleteRows(
-        removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
-      )
-
-      if (Array.isArray(removedRowIds)) {
-        const removedRowsDataSet = new Set(removedRowIds.map((row) => row[compositePrimaryKey]))
-
-        removedRowsData = removedRowsData.filter((row) => removedRowsDataSet.has(row[compositePrimaryKey] as string))
-
-        const rowIndexesSet = new Set(removedRowsData.map((row) => row.rowIndex))
-        formattedData.value = formattedData.value.filter((_, index) => rowIndexesSet.has(index))
-      } else {
-        removedRowsData = []
-      }
+      await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
     } catch (e: any) {
       return message.error(`${t('msg.error.deleteRowFailed')}: ${await extractSdkResponseErrorMsg(e)}`)
     }
@@ -830,10 +806,8 @@ export function useData(args: {
 
     addUndo({
       redo: {
-        fn: async function redo(this: UndoRedoAction, removedRowsData: Record<string, any>[], compositePrimaryKey: string) {
-          const removedRowIds = await bulkDeleteRows(
-            removedRowsData.map((row) => ({ [compositePrimaryKey]: row[compositePrimaryKey] as string })),
-          )
+        fn: async function redo(this: UndoRedoAction, removedRowsData: Record<string, any>[]) {
+          const removedRowIds = await bulkDeleteRows(removedRowsData.map((row) => row.pkData))
 
           if (Array.isArray(removedRowIds)) {
             for (const { row } of removedRowsData) {
@@ -846,7 +820,7 @@ export function useData(args: {
 
           await callbacks?.syncPagination?.()
         },
-        args: [removedRowsData, compositePrimaryKey],
+        args: [removedRowsData],
       },
       undo: {
         fn: async function undo(
diff --git a/packages/nc-gui/composables/useExpandedFormDetached/index.ts b/packages/nc-gui/composables/useExpandedFormDetached/index.ts
index 6dfc6b6fa7..f7cfe33b10 100644
--- a/packages/nc-gui/composables/useExpandedFormDetached/index.ts
+++ b/packages/nc-gui/composables/useExpandedFormDetached/index.ts
@@ -19,6 +19,8 @@ const [setup, use] = useInjectionState(() => {
   return ref<UseExpandedFormDetachedProps[]>([])
 })
 
+export { setup as useExpandedFormDetachedProvider }
+
 export function useExpandedFormDetached() {
   let states = use()!
 
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 60a32a85fd..95c766bde9 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -56,6 +56,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
       : ({ row: {}, oldRow: {}, rowMeta: {} } as Row),
   )
 
+  row.value.rowMeta.fromExpandedForm = true
+
   const rowStore = useProvideSmartsheetRowStore(row)
 
   const activeView = inject(ActiveViewInj, ref())
@@ -304,6 +306,8 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
   }
 
   const loadRow = async (rowId?: string, onlyVirtual = false) => {
+    if (row.value.rowMeta.new) return
+
     if (isPublic.value || !meta.value?.id) return
     let record = await $api.dbTableRow.read(
       NOCO,
diff --git a/packages/nc-gui/composables/useLTARStore.ts b/packages/nc-gui/composables/useLTARStore.ts
index 4ece4be094..747e0aaca2 100644
--- a/packages/nc-gui/composables/useLTARStore.ts
+++ b/packages/nc-gui/composables/useLTARStore.ts
@@ -12,9 +12,11 @@ import {
   IsPublicInj,
   Modal,
   NOCO,
+  NcErrorType,
   SharedViewPasswordInj,
   computed,
   extractSdkResponseErrorMsg,
+  extractSdkResponseErrorMsgv2,
   inject,
   message,
   parseProp,
@@ -188,15 +190,16 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
       return row.value.row[displayValueProp.value]
     })
 
-    const loadChildrenExcludedList = async (activeState?: any) => {
+    const loadChildrenExcludedList = async (activeState?: any, resetOffset: boolean = false) => {
       if (activeState) newRowState.state = activeState
       try {
         let offset =
           childrenExcludedListPagination.size * (childrenExcludedListPagination.page - 1) - childrenExcludedOffsetCount.value
 
-        if (offset < 0) {
+        if (offset < 0 || resetOffset) {
           offset = 0
           childrenExcludedOffsetCount.value = 0
+          childrenExcludedListPagination.page = 1
         }
         isChildrenExcludedLoading.value = true
         if (isPublic.value) {
@@ -266,7 +269,11 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
           // Mark out exact same objects in activeState[column.value.title] as Linked
           // compare all keys and values
           childrenExcludedList.value.list.forEach((row: any, index: number) => {
-            const found = activeState[column.value.title].find((a: any) => {
+            const found = (
+              [RelationTypes.BELONGS_TO, RelationTypes.ONE_TO_ONE].includes(colOptions.value.type)
+                ? [activeState[column.value.title]]
+                : activeState[column.value.title]
+            ).find((a: any) => {
               let isSame = true
 
               for (const key in a) {
@@ -284,27 +291,29 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
         }
       } catch (e: any) {
         // temporary fix to handle when offset is beyond limit
-        if ((await extractSdkResponseErrorMsg(e)) === 'Offset is beyond the total number of records') {
+        const error = await extractSdkResponseErrorMsgv2(e)
+
+        if (error.error === NcErrorType.INVALID_OFFSET_VALUE) {
           childrenExcludedListPagination.page = 0
-          return loadChildrenExcludedList(activeState)
+          return loadChildrenExcludedList(activeState, true)
         }
 
-        message.error(`${t('msg.error.failedToLoadList')}: ${await extractSdkResponseErrorMsg(e)}`)
+        message.error(`${t('msg.error.failedToLoadList')}: ${error.message}`)
       } finally {
         isChildrenExcludedLoading.value = false
       }
     }
 
-    const loadChildrenList = async () => {
+    const loadChildrenList = async (resetOffset: boolean = false) => {
       try {
         isChildrenLoading.value = true
         if ([RelationTypes.BELONGS_TO, RelationTypes.ONE_TO_ONE].includes(colOptions.value.type)) return
         if (!rowId.value || !column.value) return
         let offset = childrenListPagination.size * (childrenListPagination.page - 1) + childrenListOffsetCount.value
-
-        if (offset < 0) {
+        if (offset < 0 || resetOffset) {
           offset = 0
           childrenListOffsetCount.value = 0
+          childrenListPagination.page = 1
         } else if (offset >= childrenListCount.value) {
           offset = 0
         }
@@ -347,6 +356,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState(
           isChildrenListLinked.value[index] = true
           isChildrenListLoading.value[index] = false
         })
+
         if (!childrenListPagination.query) {
           childrenListCount.value = childrenList.value?.pageInfo.totalRows ?? 0
         }
diff --git a/packages/nc-gui/composables/useOrganization.ts b/packages/nc-gui/composables/useOrganization.ts
new file mode 100644
index 0000000000..3dea47c819
--- /dev/null
+++ b/packages/nc-gui/composables/useOrganization.ts
@@ -0,0 +1,23 @@
+export const useOrganization = () => {
+  const workspaces = ref([])
+  const members = ref([])
+  const bases = ref([])
+
+  const { orgId } = storeToRefs(useOrg())
+
+  const listWorkspaces = async (..._args: any) => {}
+
+  const fetchOrganizationMembers = async (..._args: any) => {}
+
+  const fetchOrganizationBases = async (..._args: any) => {}
+
+  return {
+    orgId,
+    workspaces,
+    listWorkspaces,
+    fetchOrganizationMembers,
+    fetchOrganizationBases,
+    bases,
+    members,
+  }
+}
diff --git a/packages/nc-gui/composables/useSmartsheetStore.ts b/packages/nc-gui/composables/useSmartsheetStore.ts
index 48be07d8be..38f8a97e67 100644
--- a/packages/nc-gui/composables/useSmartsheetStore.ts
+++ b/packages/nc-gui/composables/useSmartsheetStore.ts
@@ -38,6 +38,7 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
     const isKanban = computed(() => view.value?.type === ViewTypes.KANBAN)
     const isMap = computed(() => view.value?.type === ViewTypes.MAP)
     const isSharedForm = computed(() => isForm.value && shared)
+    const isDefaultView = computed(() => view.value?.is_default)
     const xWhere = computed(() => {
       let where
       const col =
@@ -100,6 +101,7 @@ const [useProvideSmartsheetStore, useSmartsheetStore] = useInjectionState(
       eventBus,
       sqlUi,
       allFilters,
+      isDefaultView,
     }
   },
   'smartsheet-store',
diff --git a/packages/nc-gui/composables/useUserSorts.ts b/packages/nc-gui/composables/useUserSorts.ts
index 9182a701e5..1692d51952 100644
--- a/packages/nc-gui/composables/useUserSorts.ts
+++ b/packages/nc-gui/composables/useUserSorts.ts
@@ -9,7 +9,7 @@ import { useGlobal } from '#imports'
  * @param {string} roleType - The type of role for which user sorts are managed ('Workspace', 'Org', or 'Project').
  * @returns {object} An object containing reactive values and functions related to user sorts.
  */
-export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
+export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project' | 'Organization') {
   const clone = rfdc()
 
   const { user } = useGlobal()
@@ -110,6 +110,8 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
       userRoleOrder = Object.values(OrderedOrgRoles)
     } else if (roleType === 'Project') {
       userRoleOrder = Object.values(OrderedProjectRoles)
+    } else if (roleType === 'Organization') {
+      userRoleOrder = Object.values(OrderedOrgRoles)
     }
 
     data = clone(data)
@@ -136,6 +138,13 @@ export function useUserSorts(roleType: 'Workspace' | 'Org' | 'Project') {
             return b[sortsConfig.field]?.localeCompare(a[sortsConfig.field])
           }
         }
+        case 'title': {
+          if (sortsConfig.direction === 'asc') {
+            return a[sortsConfig.field] - b[sortsConfig.field]
+          } else {
+            return b[sortsConfig.field] - a[sortsConfig.field]
+          }
+        }
       }
 
       return 0
diff --git a/packages/nc-gui/composables/useViewColumns.ts b/packages/nc-gui/composables/useViewColumns.ts
index edaf8adb19..ffcffd867b 100644
--- a/packages/nc-gui/composables/useViewColumns.ts
+++ b/packages/nc-gui/composables/useViewColumns.ts
@@ -159,7 +159,12 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
       $e('a:fields:show-all')
     }
 
-    const saveOrUpdate = async (field: any, index: number, disableDataReload: boolean = false) => {
+    const saveOrUpdate = async (
+      field: any,
+      index: number,
+      disableDataReload: boolean = false,
+      updateDefaultViewColumnOrder: boolean = false,
+    ) => {
       if (isLocalMode.value && fields.value) {
         fields.value[index] = field
         meta.value!.columns = meta.value!.columns?.map((column: ColumnType) => {
@@ -168,6 +173,7 @@ const [useProvideViewColumns, useViewColumns] = useInjectionState(
               ...column,
               ...field,
               id: field.fk_column_id,
+              ...(updateDefaultViewColumnOrder ? { meta: { ...parseProp(column.meta), defaultViewColOrder: field.order } } : {}),
             }
           }
           return column
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 42c23b7436..c077b2428c 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -177,7 +177,7 @@ export function useViewData(
 
   const controller = ref()
 
-  async function loadData(params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}) {
+  async function loadData(params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}, shouldShowLoading = true) {
     if ((!base?.value?.id || !metaId.value || !viewMeta.value?.id) && !isPublic.value) return
 
     if (controller.value) {
@@ -188,7 +188,7 @@ export function useViewData(
 
     controller.value = CancelToken.source()
 
-    isPaginationLoading.value = true
+    if (shouldShowLoading) isPaginationLoading.value = true
     let response
 
     try {
diff --git a/packages/nc-gui/context/index.ts b/packages/nc-gui/context/index.ts
index dd5d02c427..cfc411a49e 100644
--- a/packages/nc-gui/context/index.ts
+++ b/packages/nc-gui/context/index.ts
@@ -57,3 +57,5 @@ export const TreeViewInj: InjectionKey<{
 export const CalendarViewTypeInj: InjectionKey<Ref<'week' | 'month' | 'day' | 'year'>> = Symbol('calendar-view-type-injection')
 export const JsonExpandInj: InjectionKey<Ref<boolean>> = Symbol('json-expand-injection')
 export const AllFiltersInj: InjectionKey<Ref<Record<string, FilterType[]>>> = Symbol('all-filters-injection')
+
+export const IsAdminPanelInj: InjectionKey<Ref<boolean>> = Symbol('is-admin-panel-injection')
diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 7dcdd0690f..feb0e9facf 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "الرئيسية",
     "load": "تحميل",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "مشاهد",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "ليس فارغاً"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "البحث عن {بحث} لم يتم العثور على نتائج",
diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index 4d513ac76a..d76f3b0ad8 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "বাড়ি",
     "load": "ভার",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "দর্শক",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "নাল নয়"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "আপনার অনুসন্ধান {search} এর জন্য কোনও ফলাফল পাওয়া যায় নি",
diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index 9344d05f92..c402443237 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Domů",
     "load": "Načíst",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Sledující",
       "noaccess": "No Access",
       "superAdmin": "Hlavní administrátor",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Tvůrce na úrovni organizace",
       "orgLevelViewer": "Prohlížeč na úrovni organizace"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "není null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Dokumentace",
     "forum": "Fórum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Operace Vložit není v aktivní buňce podporována.",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Vaše hledání na {search} nenašlo žádné výsledky",
diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index 8e0eb3352f..0477b412d1 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Forside",
     "load": "Indlæs",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Viewer.",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Skaberen på organisationsniveau",
       "orgLevelViewer": "Visning på organisationsniveau"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "er ikke null."
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Indsæt er ikke understøttet på den aktive celle",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Din søgning efter {Søg} viste ingen resultater",
diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 54afd6df01..9e81c0931e 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Beenden",
     "home": "Start",
     "load": "Laden",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown-Liste",
     "list": "Liste",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Tag",
     "week": "Woche",
     "month": "Monat",
@@ -247,6 +252,7 @@
       "viewer": "Betrachter",
       "noaccess": "Kein Zugriff",
       "superAdmin": "Super-Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organisationsebenen-Ersteller",
       "orgLevelViewer": "Organisationsebenen-Betrachter"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "ist nicht Null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentifizierung (SSO)",
     "docs": "Dokumentation",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Vorherige",
     "nextMonth": "Folgender Monat",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Passwort eingeben",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Der Vorgang Einfügen wird auf der aktiven Zelle nicht unterstützt",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Ihre Suche nach {search} fand keine Ergebnisse",
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index b0164345ec..790bca109b 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Home",
     "load": "Load",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Viewer",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "is not null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results"
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace":"-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "SAML",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Your search for {search} found no results",
diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index 0402f47afd..568b9da3d6 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Salir",
     "home": "Inicio",
     "load": "Cargar",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Día",
     "week": "Semana",
     "month": "Mes",
@@ -247,6 +252,7 @@
       "viewer": "Visor",
       "noaccess": "Sin acceso",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Creador a nivel de organización",
       "orgLevelViewer": "Visor de nivel de organización"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "no es nulo"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Autenticación (SSO)",
     "docs": "Documentos",
     "forum": "Foro",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Seleccionar Año",
     "save": "Guardar",
     "cancel": "Cancelar",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "Nuevo proveedor",
     "generalSettings": "Ajustes Generales",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "Ajustes SSO",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organizar por",
     "previous": "Anterior",
     "nextMonth": "Mes siguiente",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "La vista del calendario requiere un rango de fechas",
     "goToToday": "Ir a Hoy",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Introducir la contraseña",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "Un único registro de la tabla ",
       "tooltip_desc2": " puede vincularse con un único registro de la tabla "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No hay registros vinculados",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "registros vinculados",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "No se admite la operación de pegado en la celda activa",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Tu búsqueda de {search} no encontró resultados",
diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index e092e06564..25c893f196 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Irten",
     "home": "Hasiera",
     "load": "Kargatu",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Ikuslea",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "is not null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Dokumentuak",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Your search for {search} found no results",
diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index 4b6d152be4..e0ec0b64bd 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "خروج",
     "home": "خانه",
     "load": "لود کردن",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "بیننده",
       "noaccess": "بدون دسترسی",
       "superAdmin": "مدیر ارشد",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "تولید کننده سطح سازمانی",
       "orgLevelViewer": "مشاهده کننده سطح سازمانی"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "تهی نیست"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "مستندات",
     "forum": "انجمن",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "عملیات جای‌گذاری در سلول فعال پشتیبانی نمی‌شود",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "جست‌وجوی شما برای {search} نتیجه‌ای نداشت",
diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index 01b415f060..b8a27bb666 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Koti",
     "load": "Ladata",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Katselija",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organisaatiotason luoja",
       "orgLevelViewer": "Organisaatiotason katseluohjelma"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "ei ole nolla"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Liitä-toimintoa ei tueta aktiivisessa solussa.",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Hakusi {haku} ei löytänyt tuloksia",
diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 0d48460c35..39f8a1bd96 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quitter",
     "home": "Accueil",
     "load": "Charger",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Liste déroulante",
     "list": "Liste",
+    "verify": "Verify",
     "apply": "Appliquer",
     "text": "Texte",
     "appearance": "Apparence"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Jour",
     "week": "Semaine",
     "month": "Mois",
@@ -247,6 +252,7 @@
       "viewer": "Lecture seule",
       "noaccess": "Accès interdit",
       "superAdmin": "Super administrateur",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Créateur au niveau de l'organisation",
       "orgLevelViewer": "Visualiseur de niveau d'organisation"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "est non null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Documents",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Langage de balisage d'assertion de sécurité (SAML)",
     "newProvider": "Nouveau fournisseur",
     "generalSettings": "Paramètres généraux",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "Paramètres SSO",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Cliquer pour copier l'ID du champ",
     "enterPassword": "Saisir le mot de passe",
     "bySigningUp": "En vous inscrivant, vous acceptez les",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Désactivé car la vue est verrouillée",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "L'opération de collage n'est pas prise en charge sur la cellule active",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Le nom doit comporter au moins 2 caractères",
       "nameMaxLength": "Le nom doit comporter au maximum 60 caractères",
       "viewNameRequired": "Le nom de la vue est obligatoire",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Le nom doit comporter au maximum 256 caractères",
       "viewNameUnique": "Le nom de la vue doit être unique",
       "searchProject": "Votre recherche pour {search} n'a renvoyé aucun résultat",
diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index eadd124818..51e6232a7a 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "יציאה",
     "home": "בית",
     "load": "טען",
@@ -198,11 +200,14 @@
     "logo": "סמליל",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "צוֹפֶה",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "is not null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "לבחור שנה",
     "save": "שמירה",
     "cancel": "ביטול",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "ספק חדש",
     "generalSettings": "הגדרות כלליות",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "הגדרות SSO",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "מאורגן על-ידי",
     "previous": "הקודם",
     "nextMonth": "החודש הבא",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "החיפוש שלך {חיפוש} לא נמצא תוצאות",
diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index f60be60dc4..fe14ba303a 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "घर",
     "load": "भार",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "दर्शक",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "निरर्थक नहीं है"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "{search} के लिए आपकी खोज कोई परिणाम नहीं मिला",
diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index d43fd809f3..c071e7539b 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Dom",
     "load": "Opterećenje",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Preglednika",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Stvaratelj na razini organizacije",
       "orgLevelViewer": "Preglednik na razini organizacije"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "nije ništavan"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Operacija \"lijepljenje\" nije podržana u aktivnoj ćeliji",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Vaša potraga za {Search} nije pronašla rezultate",
diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index 898105944c..d50d06baf7 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Keluar",
     "home": "Rumah",
     "load": "Memuat",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Penonton",
       "noaccess": "Tidak ada akses",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Pembuat Tingkat Organisasi",
       "orgLevelViewer": "Penampil Tingkat Organisasi"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "bukan null."
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Operasi tempel tidak didukung pada sel aktif",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Pencarian Anda untuk {Search} tidak menemukan hasil",
diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index 07232b5b8a..7fe6eb56b2 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Esci",
     "home": "Pagina iniziale",
     "load": "Carica",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Spettatore",
       "noaccess": "Nessun Accesso",
       "superAdmin": "Super admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Creatore a livello di organizzazione",
       "orgLevelViewer": "Visualizzatore a livello di organizzazione"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "non è nullo"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Documentazione",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Fare clic per copiare l'Id del campo",
     "enterPassword": "Inserisci password",
     "bySigningUp": "Registrandoti, accetti i",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "Una singola riga dalla tabella ",
       "tooltip_desc2": " può essere collegato con una riga della tabella "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "Nessun record collegato",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "record collegati",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabilitato perché la Vista è bloccata",
       "basesMigrated": "Le Basi sono migrate. Per favore riprova.",
       "pasteNotSupported": "L'operazione di incollamento non è supportata sulla cella attiva.",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Il nome deve essere lungo almeno 2 caratteri",
       "nameMaxLength": "Il nome deve essere lungo al più 60 caratteri",
       "viewNameRequired": "È necessario inserire il nome della vista",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Il nome deve essere lungo al più 256 caratteri",
       "viewNameUnique": "Il nome della Visualizzazione deve essere unico",
       "searchProject": "La tua ricerca di {search} non ha trovato risultati",
diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index 79837beacb..bb7e981b69 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "終了",
     "home": "ホーム",
     "load": "読み込み",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "閲覧者",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "組織レベルのクリエイター",
       "orgLevelViewer": "組織レベルビューワ"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "がnullでない"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "現在アクティブなセルでは貼り付けはサポートされていません",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "{search} の検索結果が見つかりませんでした",
diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 03e54dbe51..f5b64d46fd 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "나가기",
     "home": "홈",
     "load": "불러오기",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "뷰어",
       "noaccess": "권한 없음",
       "superAdmin": "최고 운영자",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "조직 수준 생성",
       "orgLevelViewer": "조직 수준 뷰어"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "null 값이 아님"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "문서",
     "forum": "포럼",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "클릭하여 필드 ID 복사",
     "enterPassword": "비밀번호를 입력하십시오",
     "bySigningUp": "회원가입시 다음 약관에 동의한 것으로 간주합니다.",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "테이블의 단일 레코드 ",
       "tooltip_desc2": " 테이블의 단일 레코드와 연결될 수 있습니다."
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "레코드가 연결되지 않았습니다.",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "레코드가 연결되었습니다.",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "베이스가 마이그레이션되었습니다. 다시 시도하십시오.",
       "pasteNotSupported": "활성 셀에서는 붙여넣기 작업이 지원되지 않습니다.",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "검색 결과가 없습니다",
diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index 3a66ebea85..3781a4b81c 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Sākumlapa",
     "load": "Ielādēt",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Skatītājs",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organizācijas līmeņa radītājs",
       "orgLevelViewer": "Organizācijas līmeņa skatītājs"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "nav null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Aktīvajā šūnā netiek atbalstīta operācija \"ielīmēt\".",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Nav atrasti rezultāti meklējot pēc atslēgvārda {search}",
diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index 1be40457d4..6e379b7cdb 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Dashboard",
     "load": "Laden",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Kijker",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Schepper op organisatieniveau",
       "orgLevelViewer": "Viewer op organisatieniveau"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "is niet NULL"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Plakken wordt niet ondersteund op de actieve cel",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Uw zoekopdracht voor {search} heeft geen resultaten opgeleverd",
diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index aaaca480aa..9c1f07bf9c 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Hjem",
     "load": "Laste",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Seer.",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "er ikke null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Søket ditt etter {søk} fant ingen resultater",
diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index 26a1490412..4f8f074ee3 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Wyjdź",
     "home": "Start",
     "load": "Załaduj",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Rozwijane menu",
     "list": "Lista",
+    "verify": "Verify",
     "apply": "Zastosuj",
     "text": "Tekst",
     "appearance": "Wygląd"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Dzień",
     "week": "Tydzień",
     "month": "Miesiąc",
@@ -247,6 +252,7 @@
       "viewer": "Obserwator",
       "noaccess": "Brak dostępu",
       "superAdmin": "Superadministrator",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Twórca na poziomie organizacji",
       "orgLevelViewer": "Obserwator na poziomie organizacji"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "Nie jest null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Autoryzacja (SSO)",
     "docs": "Dokumentacja",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Wybierz rok",
     "save": "Zapisz",
     "cancel": "Anuluj",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "Nowy dostawca",
     "generalSettings": "Ustawienia ogólne",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "Ustawienia SSO",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organizuj według",
     "previous": "Poprzedni",
     "nextMonth": "Następny miesiąc",
@@ -709,9 +760,16 @@
     "clearSelection": "Wyczyść wybór"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Dodaj Członków",
     "enterEmail": "Wpisz adresy e-mail",
     "inviteToBase": "Zaproś do bazy",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Dodaj członka do bazy",
     "noRange": "Widok kalendarza wymaga zakresu dat",
     "goToToday": "Przejdź do dzisiaj",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Opcje wyszukiwania"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Kliknij, aby skopiować Identyfikator Pola",
     "enterPassword": "Wprowadź hasło",
     "bySigningUp": "Rejestrując się, zgadzasz się na",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "Pojedynczy rekord z tabeli ",
       "tooltip_desc2": " może być powiązany z pojedynczym rekordem z tabeli "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Kliknij 'Połącz Rekordy', aby rozpocząć kojarzenie danych z '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "Żadne rekordy nie są powiązane",
     "noLinkedRecords": "Brak powiązanych rekordów",
     "recordsLinked": "rekordy powiązane",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Proszę wkleić ten adres URL w konsoli dostawcy tożsamości",
       "noSaml": "Nie ma skonfigurowanych uwierzytelnień SAML.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Wyłączone, ponieważ widok jest zablokowany",
       "basesMigrated": "Bazy zostały przeniesione. Proszę spróbować ponownie.",
       "pasteNotSupported": "Operacja wklejania nie jest obsługiwana w aktywnej komórce",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Błąd podczas pobierania danych kalendarza",
       "fetchingActiveDates": "Błąd podczas pobierania aktywnych dat",
       "scopesRequired": "Wymagane zakresy",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Wymagany jest URL autoryzacji",
       "userNameAttributeRequired": "Wymagany jest atrybut nazwy użytkownika",
       "clientIdRequired": "Wymagane jest ID klienta",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Nazwa musi mieć co najmniej 2 znaki",
       "nameMaxLength": "Nazwa musi mieć maksymalnie 60 znaków",
       "viewNameRequired": "Wymagana nazwa widoku",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Nazwa musi mieć maksymalnie 256 znaków",
       "viewNameUnique": "Nazwa widoku powinna być unikalna",
       "searchProject": "Twoje wyszukiwanie dla {search}, nie znaleziono żadnych wyników",
diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index 06a81e8e4b..515a7e11be 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Sair",
     "home": "Casa",
     "load": "Carga",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Aplicar",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Dia",
     "week": "Semana",
     "month": "Mês",
@@ -247,6 +252,7 @@
       "viewer": "Viewer.",
       "noaccess": "Sem acesso",
       "superAdmin": "Administrador Geral",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Nível de Organização Criador",
       "orgLevelViewer": "Visor de Nível de Organização"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "não é nulo"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Autenticação (SSO)",
     "docs": "Documentação",
     "forum": "Fórum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Selecionar ano",
     "save": "Guardar",
     "cancel": "Cancelar",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "Novo provedor",
     "generalSettings": "Configurações gerais",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "Configurações SSO",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organizar por",
     "previous": "Anterior",
     "nextMonth": "Próximo mês",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "A operação de colar não é suportada na célula activa",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "A sua pesquisa por {search} não encontrou resultados",
diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 4a4a286f0d..c45eb82e42 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Sair",
     "home": "Início",
     "load": "Carregar",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Dia",
     "week": "Semana",
     "month": "Mês",
@@ -247,6 +252,7 @@
       "viewer": "Visualizador",
       "noaccess": "No Access",
       "superAdmin": "Super Administrador",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Criador de Nível da Organização",
       "orgLevelViewer": "Visualizador de nível da organização"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "não é nulo"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Autenticação (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "A operação de colar não é suportada na célula activa",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "A sua pesquisa por {search} não encontrou resultados",
diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index b2b3d7939f..579a6ec2f2 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Выйти",
     "home": "На главную",
     "load": "Загрузка",
@@ -198,11 +200,14 @@
     "logo": "Логотип",
     "dropdown": "Выпадающий список",
     "list": "Список",
+    "verify": "Verify",
     "apply": "Применить",
     "text": "Текст",
     "appearance": "Внешний вид"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "День",
     "week": "Неделя",
     "month": "Месяц",
@@ -247,6 +252,7 @@
       "viewer": "Наблюдатель",
       "noaccess": "Нет доступа",
       "superAdmin": "Супер админ",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Уровень Создатель",
       "orgLevelViewer": "Уровень Наблюдатель"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "не равно Null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Аутентификация (SSO)",
     "docs": "Документация",
     "forum": "Форум",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Выберите год",
     "save": "Сохранить",
     "cancel": "Отмена",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "Настройки SSO",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Предыдущий",
     "nextMonth": "Следующий месяц",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Введите пароль",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Операция Вставки не поддерживается в выделенной ячейке",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Ваш поиск {поиск} не дал результатов",
diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index e5c18807c1..139ac4ce7b 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Domov",
     "load": "Zaťaženie",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Prehliadač",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Tvorca na úrovni organizácie",
       "orgLevelViewer": "Prehliadač na úrovni organizácie"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "nie je null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Operácia Vložiť nie je podporovaná v aktívnej bunke",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Vaše vyhľadávanie na {search} nenašlo žiadne výsledky",
diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index 02eefdcaff..7fecee801f 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Doma",
     "load": "Load.",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Gledalca.",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Ustvarjalec na ravni organizacije",
       "orgLevelViewer": "Pregledovalnik na ravni organizacije"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "ni null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Operacija Vstavi ni podprta v aktivni celici",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Vaše iskanje {search} ni dalo rezultatov",
diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index 6ed541ecc1..ac9439b8b8 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Hem",
     "load": "Ladda",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Dag",
     "week": "Vecka",
     "month": "Månad",
@@ -247,6 +252,7 @@
       "viewer": "Visare",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organisatorisk nivå Skapare",
       "orgLevelViewer": "Visare för organisationsnivå"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "är inte noll"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Autentisering (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Spara",
     "cancel": "Avbryt",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Ange lösenord",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Klistra in stöds inte på den aktiva cellen.",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Din sökning efter {Sök} har inga resultat",
diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index f7eae8f05c..10e074e829 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "บ้าน",
     "load": "โหลด",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "ผู้ดู",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "ไม่เป็นโมฆะ"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "การค้นหาของคุณสำหรับ {search} ไม่พบผลลัพธ์",
diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index a2e6d39171..7a8fd40e2b 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Çıkış",
     "home": "Ana Sayfa",
     "load": "Yükle",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Açılır menü",
     "list": "Liste",
+    "verify": "Verify",
     "apply": "Uygula",
     "text": "Metin",
     "appearance": "Görünüm"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Gün",
     "week": "Hafta",
     "month": "Ay",
@@ -247,6 +252,7 @@
       "viewer": "İzleyici",
       "noaccess": "Erişim Yok",
       "superAdmin": "Süper Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organizasyon Seviyesi Oluşturucu",
       "orgLevelViewer": "Organizasyon Seviyesi Görüntüleyici"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "null değil"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Kimlik Doğrulama (SSO)",
     "docs": "Dokümantasyon",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Yıl Seçin",
     "save": "Kaydet",
     "cancel": "İptal",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "Yeni Sağlayıcı",
     "generalSettings": "Genel Ayarlar",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Ayarları",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Önceki",
     "nextMonth": "Sonraki Ay",
@@ -709,9 +760,16 @@
     "clearSelection": "Seçimi temizle"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Üye Ekle",
     "enterEmail": "E-posta adresi girin",
     "inviteToBase": "Projeye Davet Et",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Projeye Üye Ekle",
     "noRange": "Takvim görünümü bir tarih aralığı gerektirir",
     "goToToday": "Bugün",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Etkin hücre üzerinde yapıştırma işlemi desteklenmiyor",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "{search} için aramanız hiç bir sonuç bulamadı",
diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index 060c2dc9e7..045452eb6d 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Вийти",
     "home": "Головна",
     "load": "Завантажити",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Глядач",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Творець рівня організації",
       "orgLevelViewer": "Глядач рівня організації"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "не рівне null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Операція вставки не підтримується в активній комірці",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "За вашим запитом {search} не знайдено жодного результату",
diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index c262955444..d121dae9fd 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "Trang chủ",
     "load": "Trọng tải",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "Người xem",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "không phải là null."
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "Paste operation is not supported on the active cell",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "Tìm kiếm của bạn cho {search} tìm thấy không có kết quả",
diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
index e37ca7ffef..4af00866d2 100644
--- a/packages/nc-gui/lang/zh-Hans.json
+++ b/packages/nc-gui/lang/zh-Hans.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "退出",
     "home": "首页",
     "load": "加载",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "下拉",
     "list": "列表",
+    "verify": "Verify",
     "apply": "应用",
     "text": "文本",
     "appearance": "外观"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "日",
     "week": "周",
     "month": "月",
@@ -247,6 +252,7 @@
       "viewer": "浏览者",
       "noaccess": "没有访问权限",
       "superAdmin": "超级管理员",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "创始人",
       "orgLevelViewer": "游客"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "不为空（Not Null）"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "身份验证 (SSO)",
     "docs": "文档",
     "forum": "论坛",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "选择年份",
     "save": "保存",
     "cancel": "取消",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "连接服务",
     "generalSettings": "通用设置",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO设置",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "组织方式",
     "previous": "返回",
     "nextMonth": "下个月",
@@ -709,9 +760,16 @@
     "clearSelection": "清除选择"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "添加成员",
     "enterEmail": "输入邮箱地址",
     "inviteToBase": "邀请",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "添加用户到项目",
     "noRange": "日历视图需要日期范围",
     "goToToday": "转到今天",
@@ -1036,6 +1094,11 @@
     "searchOptions": "搜索选项"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "点击复制字段ID",
     "enterPassword": "输入密码",
     "bySigningUp": "注册即表示您同意服务条款",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "表中的一条记录 ",
       "tooltip_desc2": " 可以从表中链接到单条记录 "
     },
-    "clickLinkRecordsToAddLinkFromTable": "点击\"引用\"将数据关联到 \"{tableName}\"",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "没有链接记录",
     "noLinkedRecords": "暂无引用数据",
     "recordsLinked": "链接的记录",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "将此URL粘贴到您的身份提供商后台",
       "noSaml": "没有配置 SAML 身份验证",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "已禁用，因为视图已锁定",
       "basesMigrated": "项目已迁移。请重试。",
       "pasteNotSupported": "处于活动状态的单元格不能粘贴内容",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "获取日历数据时出错",
       "fetchingActiveDates": "获取活动日期时出错",
       "scopesRequired": "范围不能为空",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "鉴权链接不能为空",
       "userNameAttributeRequired": "用户名不能为空",
       "clientIdRequired": "Client ID 不能为空",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "名称长度必须至少为 2 个字符",
       "nameMaxLength": "名称长度不得超过 60 个字符",
       "viewNameRequired": "视图名称为必填项",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "名称长度不得超过 256 个字符",
       "viewNameUnique": "视图名称应该是唯一的",
       "searchProject": "搜索： {search} 没有发现匹配的结果",
diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
index 3a78b66ed7..d06a67e99a 100644
--- a/packages/nc-gui/lang/zh-Hant.json
+++ b/packages/nc-gui/lang/zh-Hant.json
@@ -39,6 +39,8 @@
     }
   },
   "general": {
+    "role": "Role",
+    "general": "General",
     "quit": "Quit",
     "home": "首頁",
     "load": "載入",
@@ -198,11 +200,14 @@
     "logo": "Logo",
     "dropdown": "Dropdown",
     "list": "List",
+    "verify": "Verify",
     "apply": "Apply",
     "text": "Text",
     "appearance": "Appearance"
   },
   "objects": {
+    "owner": "Owner",
+    "member": "Member",
     "day": "Day",
     "week": "Week",
     "month": "Month",
@@ -247,6 +252,7 @@
       "viewer": "檢視者",
       "noaccess": "No Access",
       "superAdmin": "Super Admin",
+      "orgLevelOwner": "Organization Level Owner",
       "orgLevelCreator": "組織層級建立者",
       "orgLevelViewer": "組織層級檢視者"
     },
@@ -313,6 +319,10 @@
     "isNotNull": "內容不為 Null"
   },
   "title": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename Workspace",
+    "renamingWorkspace": "Renaming Workspace",
+    "renamingBase": "Renaming Base",
     "sso": "Authentication (SSO)",
     "docs": "Docs",
     "forum": "Forum",
@@ -437,6 +447,39 @@
     "noResultsMatchedYourSearch": "Your search did not yield any matching results."
   },
   "labels": {
+    "txt": "TXT Record value",
+    "transferOwnership": "Transfer Ownership",
+    "recentActivity": "Recent Activity",
+    "goToMembers": "Go to Members",
+    "addMember": "Add Member",
+    "numberOfMembers": "No. Members",
+    "numberOfBases": "No. Bases",
+    "numberOfRecords": "No. Records",
+    "workspaceName": "Workspace Name",
+    "workspaceWithoutOwner": "Workspace without Owners",
+    "inviteUsersToWorkspace": "Invite Users to Workspace",
+    "selectWorkspace": "-select workspaces to invite to-",
+    "addMembersToOrganization": "Add Members to Organization",
+    "memberIn": "Member in:",
+    "assignAs": "Assign as",
+    "signOutUser": "Sign out user",
+    "signOutUsers": "Sign out users",
+    "deactivateUser": "Deactivate User",
+    "deactivateUsers": "Deactivate Users",
+    "lastActive": "Last Active",
+    "dateAdded": "Date Added",
+    "uploadImage": "Upload Image",
+    "organizationProfile": "Organisation Profile",
+    "organizationImage": "Organisation Image",
+    "organizationName": "Organisation Name",
+    "activeDomains": "Active Domains",
+    "domains": "Domains",
+    "disablePublicSharing": "Disable Public Sharing",
+    "shareSettings": "Share Settings",
+    "deleteUserAndData": "Delete User and their data",
+    "userOptions": "User Options",
+    "deleteThisOrganization": "Delete this Organisation",
+    "dangerZone": "Dangerzone",
     "selectYear": "Select Year",
     "save": "Save",
     "cancel": "Cancel",
@@ -447,7 +490,15 @@
     "saml": "Security Assertion Markup Language (SAML)",
     "newProvider": "New Provider",
     "generalSettings": "General Settings",
+    "adminPanel": "Admin Panel",
+    "moveWorkspaceToOrg": "Move Workspace To Organisation",
     "ssoSettings": "SSO Settings",
+    "addDomain": "Add Domain",
+    "domain": "Domain",
+    "settings": "Settings",
+    "workspaces": "Workspaces",
+    "back": "Back",
+    "dashboard": "Dashboard",
     "organizeBy": "Organize by",
     "previous": "Previous",
     "nextMonth": "Next Month",
@@ -709,9 +760,16 @@
     "clearSelection": "Clear selection"
   },
   "activity": {
+    "renameBase": "Rename Base",
+    "renameWorkspace": "Rename workspace",
+    "deactivate": "De-activate",
+    "manageUsers": "Manage Users",
+    "newWorkspace": "New Workspace",
+    "addDomain": "Add Domain",
     "addMembers": "Add Members",
     "enterEmail": "Enter email addresses",
     "inviteToBase": "Invite to Base",
+    "inviteToWorkspace": "Invite to Workspace",
     "addMember": "Add Member to Base",
     "noRange": "Calendar view requires a date range",
     "goToToday": "Go to Today",
@@ -1036,6 +1094,11 @@
     "searchOptions": "Search options"
   },
   "msg": {
+    "controlOrgAppearance": "Control your organisations name and appearance.",
+    "addCompanyDomains": "Add company domains to restrict access to unwanted users.",
+    "restrictUsersFromSharing": "Restrict users from being able to share bases publicly.",
+    "selectUsersToBeRemoved": "Select users to be removed and deleted from all organisation workspaces.",
+    "deleteOrganization": "Delete all users, bases and data related to this organization",
     "clickToCopyFieldId": "Click to copy Field Id",
     "enterPassword": "Enter password",
     "bySigningUp": "By signing up, you agree to the",
@@ -1118,7 +1181,7 @@
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },
-    "clickLinkRecordsToAddLinkFromTable": "Click 'Link Records' to begin associating data with '{tableName}'.",
+    "clickLinkRecordsToAddLinkFromTable": "Looks like no records have been linked yet.",
     "noRecordsLinked": "No records linked",
     "noLinkedRecords": "No linked records",
     "recordsLinked": "records linked",
@@ -1162,8 +1225,11 @@
       }
     },
     "info": {
+      "enterWorkspaceName": "Enter workspace name",
+      "enterBaseName": "Enter base name",
       "idpPaste": "Paste these URL in your Identity Providers console",
       "noSaml": "There are no configured SAML authentications.",
+      "noOIDC": "There are no configured OpenID authentications.",
       "disabledAsViewLocked": "Disabled as View is locked",
       "basesMigrated": "Bases are migrated. Please try again.",
       "pasteNotSupported": "不支援在啟用的儲存格中執行貼上",
@@ -1339,6 +1405,7 @@
       "fetchingCalendarData": "Error fetching calendar data",
       "fetchingActiveDates": "Error fetching active dates",
       "scopesRequired": "Scopes required",
+      "domainRequired": "Domain name is required",
       "authUrlRequired": "Auth URL is required",
       "userNameAttributeRequired": "Username attribute is required",
       "clientIdRequired": "Client ID is required",
@@ -1352,6 +1419,7 @@
       "nameMinLength": "Name must be at least 2 characters long",
       "nameMaxLength": "Name must be at most 60 characters long",
       "viewNameRequired": "View name is required",
+      "domainNameRequired": "Domain name is required",
       "nameMaxLength256": "Name must be at most 256 characters long",
       "viewNameUnique": "View name should be unique",
       "searchProject": "您的搜尋 {search} 找不到結果",
diff --git a/packages/nc-gui/lib/acl.ts b/packages/nc-gui/lib/acl.ts
index c38247b0ce..837f14ddb4 100644
--- a/packages/nc-gui/lib/acl.ts
+++ b/packages/nc-gui/lib/acl.ts
@@ -36,6 +36,7 @@ const rolePermissions = {
       newUser: true,
       viewCreateOrEdit: true,
       baseReorder: true,
+      orgAdminPanel: true,
     },
   },
   [OrgUserRoles.VIEWER]: {
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index 0961e14ed5..a4361cd150 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -65,6 +65,7 @@ interface Row {
     changed?: boolean
     saving?: boolean
     ltarState?: Record<string, Record<string, any> | Record<string, any>[] | null>
+    fromExpandedForm?: boolean
     // use in datetime picker component
     isUpdatedFromCopyNPaste?: Record<string, boolean>
     // Used in Calendar view
@@ -202,7 +203,7 @@ interface SidebarTableNode extends TableType {
 }
 
 interface UsersSortType {
-  field?: 'email' | 'roles'
+  field?: 'email' | 'roles' | 'title' | 'id'
   direction?: 'asc' | 'desc'
 }
 
diff --git a/packages/nc-gui/middleware/02.auth.global.ts b/packages/nc-gui/middleware/02.auth.global.ts
index e4c8a4bf33..660ce7a2d3 100644
--- a/packages/nc-gui/middleware/02.auth.global.ts
+++ b/packages/nc-gui/middleware/02.auth.global.ts
@@ -37,6 +37,8 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
 
   const { allRoles, loadRoles } = useRoles()
 
+  await checkForRedirect()
+
   /** If baseHostname defined block home page access under subdomains, and redirect to workspace page */
   if (
     state.appInfo.value.baseHostName &&
@@ -196,3 +198,19 @@ async function tryShortTokenAuth(api: Api<any>, signIn: Actions['signIn']) {
     window.location.reload()
   }
 }
+
+/** Check if url contains redirect param and redirect to the url if found */
+async function checkForRedirect() {
+  if (window.location.search && /\bui-redirect=/.test(window.location.search)) {
+    let url
+    try {
+      url = decodeURIComponent(window.location.search.split('=')[1])
+    } catch (e: any) {
+      message.error(await extractSdkResponseErrorMsg(e))
+    }
+
+    const newURL = window.location.href.split('?')[0]
+    window.history.pushState('object', document.title, `${newURL}#${url}`)
+    window.location.reload()
+  }
+}
diff --git a/packages/nc-gui/store/workspace.ts b/packages/nc-gui/store/workspace.ts
index 8dc04f1efe..b989c9baa4 100644
--- a/packages/nc-gui/store/workspace.ts
+++ b/packages/nc-gui/store/workspace.ts
@@ -2,6 +2,7 @@ import type { BaseType } from 'nocodb-sdk'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { message } from 'ant-design-vue'
 import { isString } from '@vue/shared'
+import type { ThemeConfig } from '#imports'
 import {
   computed,
   navigateTo,
@@ -13,7 +14,6 @@ import {
   useRouter,
   useTheme,
 } from '#imports'
-import type { ThemeConfig } from '#imports'
 
 export const useWorkspace = defineStore('workspaceStore', () => {
   const basesStore = useBases()
@@ -92,6 +92,8 @@ export const useWorkspace = defineStore('workspaceStore', () => {
 
   const loadWorkspace = async (..._args: any) => {}
 
+  const moveToOrg = async (..._args: any) => {}
+
   async function populateWorkspace(..._args: any) {
     isWorkspaceLoading.value = true
 
@@ -265,6 +267,7 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     workspaceUserCount,
     getPlanLimit,
     workspaceRole,
+    moveToOrg,
   }
 })
 
diff --git a/packages/nc-gui/utils/dataUtils.ts b/packages/nc-gui/utils/dataUtils.ts
index 3d783b95db..a7e0d9f500 100644
--- a/packages/nc-gui/utils/dataUtils.ts
+++ b/packages/nc-gui/utils/dataUtils.ts
@@ -5,10 +5,12 @@ import type { Row } from '~/lib'
 
 export const extractPkFromRow = (row: Record<string, any>, columns: ColumnType[]) => {
   if (!row || !columns) return null
-  return columns
-    .filter((c) => c.pk)
-    .map((c) => row?.[c.title as string])
-    .join('___')
+
+  const pkColumns = columns.filter((c) => c.pk)
+
+  if (pkColumns.every((c) => row?.[c.title as string] === null || row?.[c.title as string] === undefined)) return null
+
+  return pkColumns.map((c) => row?.[c.title as string]).join('___')
 }
 
 export const rowPkData = (row: Record<string, any>, columns: ColumnType[]) => {
diff --git a/packages/nc-gui/utils/datetimeUtils.ts b/packages/nc-gui/utils/datetimeUtils.ts
new file mode 100644
index 0000000000..7b0979ac66
--- /dev/null
+++ b/packages/nc-gui/utils/datetimeUtils.ts
@@ -0,0 +1,28 @@
+import dayjs from 'dayjs'
+import { dateFormats, timeFormats } from 'nocodb-sdk'
+
+export function parseStringDateTime(
+  v: string,
+  dateTimeFormat: string = `${dateFormats[0]} ${timeFormats[0]}`,
+  toLocal: boolean = true,
+) {
+  const dayjsObj = toLocal ? dayjs(v).local() : dayjs(v)
+
+  if (dayjsObj.isValid()) {
+    v = dayjsObj.format(dateTimeFormat)
+  } else {
+    v = toLocal ? dayjs(v, dateTimeFormat).local().format(dateTimeFormat) : dayjs(v, dateTimeFormat).format(dateTimeFormat)
+  }
+
+  return v
+}
+
+export const timeAgo = (date: any) => {
+  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date)) {
+    // if there is no timezone info, consider as UTC
+    // e.g. 2023-01-01 08:00:00 (MySQL)
+    date += '+00:00'
+  }
+  // show in local time
+  return dayjs(date).fromNow()
+}
diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts
index a286a5da2d..96ebd44266 100644
--- a/packages/nc-gui/utils/iconUtils.ts
+++ b/packages/nc-gui/utils/iconUtils.ts
@@ -125,6 +125,9 @@ import NcArrowLeft from '~icons/nc-icons/arrow-left'
 import NcArrowRight from '~icons/nc-icons/arrow-right'
 import NcUpload from '~icons/nc-icons/upload'
 import NcDownload from '~icons/nc-icons/download'
+import NcOffice from '~icons/nc-icons/office'
+import NcArrowUpRight from '~icons/nc-icons/arrow-up-right'
+import NcSlash from '~icons/nc-icons/slash'
 // import NcProjectGray from '~icons/nc-icons/project-gray'
 import NcPhoneCall from '~icons/nc-icons/phone-call'
 import NcItalic from '~icons/nc-icons/italic'
@@ -132,6 +135,9 @@ import NcBold from '~icons/nc-icons/bold'
 import NcUnderline from '~icons/nc-icons/underline'
 import NcCrop from '~icons/nc-icons/crop'
 import NcLink from '~icons/nc-icons/link'
+import NcControlPanel from '~icons/nc-icons/control-panel'
+import NcHome from '~icons/nc-icons/home'
+import NcWorkspace from '~icons/nc-icons/workspace'
 
 import NcCellBarcode from '~icons/nc-icons/cell-barcode'
 import NcCellCheckbox from '~icons/nc-icons/cell-checkbox'
@@ -325,6 +331,11 @@ import NcHelp from '~icons/nc-icons/help'
 } as const */
 
 export const iconMap = {
+  slash: NcSlash,
+  arrowUpRight: NcArrowUpRight,
+  ncWorkspace: NcWorkspace,
+  controlPanel: NcControlPanel,
+  home: NcHome,
   cellBarcode: NcCellBarcode,
   cellCheckbox: NcCellCheckbox,
   cellDate: NcCellDate,
@@ -358,6 +369,7 @@ export const iconMap = {
   cellSystemText: NcCellSystemText,
   cellAttachment: NcCellAttachment,
 
+  office: NcOffice,
   sort: Sort,
   group: Group,
   filter: Filter,
diff --git a/packages/nc-gui/utils/index.ts b/packages/nc-gui/utils/index.ts
index afcd69c42a..0507da297b 100644
--- a/packages/nc-gui/utils/index.ts
+++ b/packages/nc-gui/utils/index.ts
@@ -24,5 +24,6 @@ export * from './parseUtils'
 export * from './cell'
 export * from './workerUtils'
 export * from './parsersUtils'
+export * from './datetimeUtils'
 
 export const isEeUI = false
diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts
index 71e545d354..1321b1b460 100644
--- a/packages/nocodb-sdk/src/lib/enums.ts
+++ b/packages/nocodb-sdk/src/lib/enums.ts
@@ -4,6 +4,12 @@ export enum OrgUserRoles {
   VIEWER = 'org-level-viewer',
 }
 
+export enum CloudOrgUserRoles {
+  CREATOR = 'cloud-org-level-creator',
+  VIEWER = 'cloud-org-level-viewer',
+  OWNER = 'cloud-org-level-owner',
+}
+
 export enum ProjectRoles {
   OWNER = 'owner',
   CREATOR = 'creator',
@@ -182,6 +188,9 @@ export const RoleLabels = {
   [OrgUserRoles.SUPER_ADMIN]: 'superAdmin',
   [OrgUserRoles.CREATOR]: 'creator',
   [OrgUserRoles.VIEWER]: 'viewer',
+  [CloudOrgUserRoles.OWNER]: 'owner',
+  [CloudOrgUserRoles.CREATOR]: 'creator',
+  [CloudOrgUserRoles.VIEWER]: 'viewer',
 };
 
 export const RoleColors = {
@@ -200,6 +209,9 @@ export const RoleColors = {
   [ProjectRoles.NO_ACCESS]: 'red',
   [OrgUserRoles.CREATOR]: 'blue',
   [OrgUserRoles.VIEWER]: 'yellow',
+  [CloudOrgUserRoles.OWNER]: 'purple',
+  [CloudOrgUserRoles.CREATOR]: 'blue',
+  [CloudOrgUserRoles.VIEWER]: 'yellow',
 };
 
 export const RoleDescriptions = {
@@ -240,6 +252,10 @@ export const RoleIcons = {
   [OrgUserRoles.SUPER_ADMIN]: 'role_super',
   [OrgUserRoles.CREATOR]: 'role_creator',
   [OrgUserRoles.VIEWER]: 'role_viewer',
+
+  [CloudOrgUserRoles.OWNER]: 'role_owner',
+  [CloudOrgUserRoles.CREATOR]: 'role_creator',
+  [CloudOrgUserRoles.VIEWER]: 'role_viewer',
 };
 
 export const WorkspaceRolesToProjectRoles = {
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
index 348105b25c..533b7de7fc 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
@@ -643,6 +643,7 @@ export class SnowflakeUi {
       case 'STRING':
         return 'string';
       case 'TEXT':
+        if (col.dtxp < 1024) return 'string';
         return 'text';
       case 'BINARY':
       case 'VARBINARY':
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 2a6184c4ec..f9ddfce973 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -109,7 +109,7 @@
     "html-to-json-parser": "^2.0.1",
     "import-fresh": "^3.3.0",
     "inflection": "^1.13.4",
-    "ioredis": "^5.3.2",
+    "ioredis": "^5.4.1",
     "ioredis-mock": "^8.9.0",
     "is-docker": "^2.2.1",
     "isomorphic-dompurify": "^1.13.0",
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index c1d63f0b7c..27e321661c 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -1897,7 +1897,7 @@ class BaseModelSqlv2 {
           // .where(childTable.primaryKey.cn, cid)
           .where(_wherePk(childTable.primaryKeys, cid))
           .whereNotNull(cn),
-      ).orWhereNull(rcn);
+      );
     });
 
     if (+rest?.shuffle) {
@@ -2107,7 +2107,7 @@ class BaseModelSqlv2 {
                 ] = async function (args): Promise<any> {
                   (listLoader as any).args = args;
                   return listLoader.load(
-                    getCompositePk(self.model.primaryKeys, this),
+                    getCompositePkValue(self.model.primaryKeys, this),
                   );
                 };
               } else if (colOptions.type === 'mm') {
@@ -2148,7 +2148,7 @@ class BaseModelSqlv2 {
                 ] = async function (args): Promise<any> {
                   (listLoader as any).args = args;
                   return await listLoader.load(
-                    getCompositePk(self.model.primaryKeys, this),
+                    getCompositePkValue(self.model.primaryKeys, this),
                   );
                 };
               } else if (colOptions.type === 'bt') {
@@ -2370,7 +2370,7 @@ class BaseModelSqlv2 {
                   ] = async function (args): Promise<any> {
                     (listLoader as any).args = args;
                     return listLoader.load(
-                      getCompositePk(self.model.primaryKeys, this),
+                      getCompositePkValue(self.model.primaryKeys, this),
                     );
                   };
                 }
@@ -3124,7 +3124,7 @@ class BaseModelSqlv2 {
 
       await this.prepareNocoData(insertObj, true, cookie);
 
-      await Promise.all(preInsertOps.map((f) => f(this.dbDriver)));
+      await this.runOps(preInsertOps.map((f) => f()));
 
       let response;
       const query = this.dbDriver(this.tnPath).insert(insertObj);
@@ -3206,7 +3206,7 @@ class BaseModelSqlv2 {
       }
       rowId = this.extractCompositePK({ ai, ag, rowId, insertObj });
 
-      await Promise.all(postInsertOps.map((f) => f(rowId)));
+      await this.runOps(postInsertOps.map((f) => f(rowId)));
 
       if (rowId !== null && rowId !== undefined) {
         response = await this.readRecord({
@@ -3254,7 +3254,20 @@ class BaseModelSqlv2 {
         }
       }
       rowId = pkObj;
+    } else if (
+      !ai &&
+      !ag &&
+      (force || this.model.primaryKeys?.length > 1 || this.isSnowflake)
+    ) {
+      // handle if primary key is not ai or ag
+      const pkObj = {};
+      for (const pk of this.model.primaryKeys) {
+        const key = pk.title;
+        pkObj[key] = insertObj[pk.column_name] ?? null;
+      }
+      rowId = pkObj;
     }
+
     return rowId;
   }
 
@@ -3267,8 +3280,8 @@ class BaseModelSqlv2 {
     data: Record<string, any>;
     insertObj: Record<string, any>;
   }) {
-    const postInsertOps: ((rowId: any, trx?: any) => Promise<void>)[] = [];
-    const preInsertOps: ((trx?: any) => Promise<void>)[] = [];
+    const postInsertOps: ((rowId: any) => Promise<string>)[] = [];
+    const preInsertOps: (() => Promise<string>)[] = [];
     for (const col of nestedCols) {
       if (col.title in data) {
         const colOptions = await col.getColOptions<LinkToAnotherRecordColumn>();
@@ -3302,15 +3315,16 @@ class BaseModelSqlv2 {
 
               if (isBt) {
                 // todo: unlink the ref record
-                preInsertOps.push(async (trx: any = this.dbDriver) => {
-                  await trx(this.getTnPath(childModel.table_name))
+                preInsertOps.push(async () => {
+                  return this.dbDriver(this.getTnPath(childModel.table_name))
                     .update({
                       [childCol.column_name]: null,
                     })
                     .where(
                       childCol.column_name,
                       nestedData[childModel.primaryKey.title],
-                    );
+                    )
+                    .toQuery();
                 });
 
                 if (typeof nestedData !== 'object') continue;
@@ -3318,15 +3332,16 @@ class BaseModelSqlv2 {
                 const parentCol = await colOptions.getParentColumn();
                 insertObj[childCol.column_name] = nestedData?.[parentCol.title];
               } else {
-                postInsertOps.push(async (rowId, trx: any = this.dbDriver) => {
-                  await trx(this.getTnPath(childModel.table_name))
+                postInsertOps.push(async (rowId) => {
+                  return this.dbDriver(this.getTnPath(childModel.table_name))
                     .update({
                       [childCol.column_name]: rowId,
                     })
                     .where(
                       childModel.primaryKey.column_name,
                       nestedData[childModel.primaryKey.title],
-                    );
+                    )
+                    .toQuery();
                 });
               }
             }
@@ -3338,47 +3353,38 @@ class BaseModelSqlv2 {
               const childModel = await childCol.getModel();
               await childModel.getColumns();
 
-              postInsertOps.push(
-                async (
-                  rowId,
-                  // todo: use transaction type
-                  trx: any = this.dbDriver,
-                ) => {
-                  await trx(this.getTnPath(childModel.table_name))
-                    .update({
-                      [childCol.column_name]: rowId,
-                    })
-                    .whereIn(
-                      childModel.primaryKey.column_name,
-                      nestedData?.map((r) => r[childModel.primaryKey.title]),
-                    );
-                },
-              );
+              postInsertOps.push(async (rowId) => {
+                return this.dbDriver(this.getTnPath(childModel.table_name))
+                  .update({
+                    [childCol.column_name]: rowId,
+                  })
+                  .whereIn(
+                    childModel.primaryKey.column_name,
+                    nestedData?.map((r) => r[childModel.primaryKey.title]),
+                  )
+                  .toQuery();
+              });
             }
             break;
           case RelationTypes.MANY_TO_MANY: {
             if (!Array.isArray(nestedData)) continue;
-            postInsertOps.push(
-              async (
-                rowId,
-                // todo: use transaction type
-                trx: any = this.dbDriver,
-              ) => {
-                const parentModel = await colOptions
-                  .getParentColumn()
-                  .then((c) => c.getModel());
-                await parentModel.getColumns();
-                const parentMMCol = await colOptions.getMMParentColumn();
-                const childMMCol = await colOptions.getMMChildColumn();
-                const mmModel = await colOptions.getMMModel();
-
-                const rows = nestedData.map((r) => ({
-                  [parentMMCol.column_name]: r[parentModel.primaryKey.title],
-                  [childMMCol.column_name]: rowId,
-                }));
-                await trx(this.getTnPath(mmModel.table_name)).insert(rows);
-              },
-            );
+            postInsertOps.push(async (rowId) => {
+              const parentModel = await colOptions
+                .getParentColumn()
+                .then((c) => c.getModel());
+              await parentModel.getColumns();
+              const parentMMCol = await colOptions.getMMParentColumn();
+              const childMMCol = await colOptions.getMMChildColumn();
+              const mmModel = await colOptions.getMMModel();
+
+              const rows = nestedData.map((r) => ({
+                [parentMMCol.column_name]: r[parentModel.primaryKey.title],
+                [childMMCol.column_name]: rowId,
+              }));
+              return this.dbDriver(this.getTnPath(mmModel.table_name))
+                .insert(rows)
+                .toQuery();
+            });
           }
         }
       }
@@ -3410,8 +3416,8 @@ class BaseModelSqlv2 {
     try {
       // TODO: ag column handling for raw bulk insert
       const insertDatas = raw ? datas : [];
-      let postInsertOps: ((rowId: any, trx?: any) => Promise<void>)[] = [];
-      let preInsertOps: ((trx?: any) => Promise<void>)[] = [];
+      let postInsertOps: ((rowId: any) => Promise<string>)[] = [];
+      let preInsertOps: (() => Promise<string>)[] = [];
       let aiPkCol: Column;
       let agPkCol: Column;
 
@@ -3596,7 +3602,10 @@ class BaseModelSqlv2 {
         }
       }
 
-      await Promise.all(preInsertOps.map((f) => f(trx)));
+      await this.runOps(
+        preInsertOps.map((f) => f()),
+        trx,
+      );
 
       let responses;
 
@@ -3661,7 +3670,10 @@ class BaseModelSqlv2 {
           });
         }
 
-        await Promise.all(postInsertOps.map((f) => f(rowId, trx)));
+        await this.runOps(
+          postInsertOps.map((f) => f(rowId)),
+          trx,
+        );
       }
 
       await trx.commit();
@@ -3728,7 +3740,10 @@ class BaseModelSqlv2 {
       const pkAndData: { pk: any; data: any }[] = [];
       const readChunkSize = 100;
       for (const [i, d] of updateDatas.entries()) {
-        const pkValues = this._extractPksValues(d);
+        const pkValues = getCompositePkValue(
+          this.model.primaryKeys,
+          this._extractPksValues(d),
+        );
         if (!pkValues) {
           // throw or skip if no pk provided
           if (throwExceptionIfNotExist) {
@@ -3954,7 +3969,10 @@ class BaseModelSqlv2 {
       const pkAndData: { pk: any; data: any }[] = [];
       const readChunkSize = 100;
       for (const [i, d] of deleteIds.entries()) {
-        const pkValues = this._extractPksValues(d);
+        const pkValues = getCompositePkValue(
+          this.model.primaryKeys,
+          this._extractPksValues(d),
+        );
         if (!pkValues) {
           // throw or skip if no pk provided
           if (throwExceptionIfNotExist) {
@@ -5248,6 +5266,13 @@ class BaseModelSqlv2 {
     return data;
   }
 
+  async runOps(ops: Promise<string>[], trx = this.dbDriver) {
+    const queries = await Promise.all(ops);
+    for (const query of queries) {
+      await trx.raw(query);
+    }
+  }
+
   protected async substituteColumnIdsWithColumnTitles(
     data: Record<string, any>[],
     dependencyColumns?: Column[],
@@ -6863,8 +6888,9 @@ export function _wherePk(primaryKeys: Column[], id: unknown | unknown[]) {
   return where;
 }
 
-function getCompositePk(primaryKeys: Column[], row) {
-  return primaryKeys.map((c) => row[c.title]).join('___');
+export function getCompositePkValue(primaryKeys: Column[], row) {
+  if (typeof row !== 'object') return row;
+  return primaryKeys.map((c) => row[c.title] ?? row[c.column_name]).join('___');
 }
 
 export function haveFormulaColumn(columns: Column[]) {
diff --git a/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts b/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts
index 9b25a0c352..99094d7a6a 100644
--- a/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts
+++ b/packages/nocodb/src/db/sql-mgr/code/models/xc/ModelXcMetaSnowflake.ts
@@ -500,6 +500,7 @@ class ModelXcMetaSnowflake extends BaseModelXcMeta {
       case 'smgr':
         return dt;
       case 'text':
+        if (col.dtxp < 1024) return 'string';
         return 'text';
       case 'tid':
         return dt;
diff --git a/packages/nocodb/src/filters/global-exception/global-exception.filter.ts b/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
index b58adc793d..9560a1db62 100644
--- a/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
+++ b/packages/nocodb/src/filters/global-exception/global-exception.filter.ts
@@ -12,6 +12,7 @@ import {
   Forbidden,
   NcBaseErrorv2,
   NotFound,
+  SsoError,
   Unauthorized,
   UnprocessableEntity,
 } from '~/helpers/catchError';
@@ -48,6 +49,7 @@ export class GlobalExceptionFilter implements ExceptionFilter {
         exception instanceof Forbidden ||
         exception instanceof NotFound ||
         exception instanceof UnprocessableEntity ||
+        exception instanceof SsoError ||
         exception instanceof NotFoundException ||
         exception instanceof ThrottlerException ||
         exception instanceof ExternalError ||
@@ -69,6 +71,25 @@ export class GlobalExceptionFilter implements ExceptionFilter {
       );
     }
 
+    // if sso error then redirect to ui with error in query parameter
+    if (
+      exception instanceof SsoError ||
+      request.route?.path === '/sso/:clientId/redirect'
+    ) {
+      if (!(exception instanceof SsoError)) {
+        this.logger.warn(exception.message, exception.stack);
+      }
+
+      // encode the query parameter
+      const redirectUrl = `${
+        request.dashboardUrl
+      }?ui-redirect=${encodeURIComponent(
+        `/sso?error=${encodeURIComponent(exception.message)}`,
+      )}`;
+
+      return response.redirect(redirectUrl);
+    }
+
     // API not found
     if (exception instanceof NotFoundException) {
       this.logger.debug(exception.message, exception.stack);
diff --git a/packages/nocodb/src/helpers/catchError.ts b/packages/nocodb/src/helpers/catchError.ts
index 5e413d9e4b..a5a65682dd 100644
--- a/packages/nocodb/src/helpers/catchError.ts
+++ b/packages/nocodb/src/helpers/catchError.ts
@@ -413,6 +413,8 @@ export class Forbidden extends NcBaseError {}
 
 export class NotFound extends NcBaseError {}
 
+export class SsoError extends NcBaseError {}
+
 export class ExternalError extends NcBaseError {
   constructor(error: Error) {
     super(error.message);
@@ -578,6 +580,7 @@ export class NcBaseErrorv2 extends NcBaseError {
   error: NcErrorType;
   code: number;
   details?: any;
+
   constructor(error: NcErrorType, args?: NcErrorArgs) {
     const errorHelper = generateError(error, args);
     super(errorHelper.message);
@@ -726,4 +729,10 @@ export class NcError {
   static notAllowed(message = 'Not allowed') {
     throw new NotAllowed(message);
   }
+
+  static emailDomainNotAllowed(domain: string) {
+    throw new SsoError(
+      `Email domain ${domain} is not allowed for this organization`,
+    );
+  }
 }
diff --git a/packages/nocodb/src/helpers/getUniqueName.ts b/packages/nocodb/src/helpers/getUniqueName.ts
index e6f3c5228a..132cc37e72 100644
--- a/packages/nocodb/src/helpers/getUniqueName.ts
+++ b/packages/nocodb/src/helpers/getUniqueName.ts
@@ -1,6 +1,9 @@
 import type Column from '~/models/Column';
 
-export function getUniqueColumnName(columns: Column[], initialName = 'field') {
+export function getUniqueColumnName(
+  columns: Partial<Column>[],
+  initialName = 'field',
+) {
   let c = 0;
 
   while (
@@ -13,7 +16,7 @@ export function getUniqueColumnName(columns: Column[], initialName = 'field') {
 }
 
 export function getUniqueColumnAliasName(
-  columns: Column[],
+  columns: Partial<Column>[],
   initialName = 'field',
 ) {
   let c = 0;
diff --git a/packages/nocodb/src/helpers/populateMeta.ts b/packages/nocodb/src/helpers/populateMeta.ts
index 213fb5b2e2..397c3f0192 100644
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@@ -2,7 +2,7 @@ import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
 import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
 import { pluralize, singularize } from 'inflection';
 import { isLinksOrLTAR } from 'nocodb-sdk';
-import { getUniqueColumnAliasName } from './getUniqueName';
+import { getUniqueColumnAliasName, getUniqueColumnName } from './getUniqueName';
 import type { RollupColumn } from '~/models';
 import type LinkToAnotherRecordColumn from '~/models/LinkToAnotherRecordColumn';
 import type Source from '~/models/Source';
@@ -93,7 +93,11 @@ export async function extractAndGenerateManyToManyRelations(
     if (
       belongsToCols?.length === 2 &&
       normalColumns.length < 5 &&
-      assocModel.primaryKeys.length === 2
+      assocModel.primaryKeys.length === 2 &&
+      // check if both belongsToCol target primary keys
+      assocModel.primaryKeys.every((pk) =>
+        belongsToCols.some((c) => c.colOptions?.fk_child_column_id === pk.id),
+      )
     ) {
       const modelA = await belongsToCols[0].colOptions.getRelatedTable();
       const modelB = await belongsToCols[1].colOptions.getRelatedTable();
@@ -383,8 +387,11 @@ export async function populateMeta(
               base_id: base.id,
               db_alias: source.id,
               fk_model_id: models2[table.tn].id,
-              cn: column.cn,
-              title: column.title,
+              cn: getUniqueColumnName(models2[table.tn].columns, column.cn),
+              title: getUniqueColumnAliasName(
+                models2[table.tn].columns,
+                column.title,
+              ),
               uidt: column.uidt,
               type: column.hm ? 'hm' : column.mm ? 'mm' : 'bt',
               // column_id,
diff --git a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
index 5207b12425..ff8c3bdc76 100644
--- a/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
+++ b/packages/nocodb/src/middlewares/extract-ids/extract-ids.middleware.ts
@@ -230,6 +230,7 @@ export class AclMiddleware implements NestInterceptor {
       'blockApiTokenAccess',
       context.getHandler(),
     );
+
     const scope = this.reflector.get<string>('scope', context.getHandler());
 
     const req = context.switchToHttp().getRequest();
@@ -237,7 +238,6 @@ export class AclMiddleware implements NestInterceptor {
     if (!req.user?.isAuthorized) {
       NcError.unauthorized('Invalid token');
     }
-
     const userScopeRole =
       req.user.roles?.[OrgUserRoles.SUPER_ADMIN] === true
         ? OrgUserRoles.SUPER_ADMIN
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index cb7911001b..1d22995207 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -486,8 +486,10 @@ export default class Column<T = any> implements ColumnType {
   public static async list(
     {
       fk_model_id,
+      fk_default_view_id,
     }: {
       fk_model_id: string;
+      fk_default_view_id?: string;
     },
     ncMeta = Noco.ncMeta,
   ): Promise<Column[]> {
@@ -505,9 +507,27 @@ export default class Column<T = any> implements ColumnType {
           order: 'asc',
         },
       });
+      const defaultViewColumns = fk_default_view_id
+        ? await View.getColumns(fk_default_view_id)
+        : [];
+
+      const defaultViewColumnOrderMap = defaultViewColumns.reduce(
+        (acc, col) => {
+          acc[col.fk_column_id] = col.order;
+          return acc;
+        },
+        {} as Record<string, number>,
+      );
 
       columnsList.forEach((column) => {
         column.meta = parseMetaProp(column);
+
+        if (defaultViewColumns.length) {
+          column.meta = {
+            ...column.meta,
+            defaultViewColOrder: defaultViewColumnOrderMap[column.id],
+          };
+        }
       });
 
       await NocoCache.setList(CacheScope.COLUMN, [fk_model_id], columnsList);
diff --git a/packages/nocodb/src/models/Model.ts b/packages/nocodb/src/models/Model.ts
index 1148dbe6f5..8f62c1b173 100644
--- a/packages/nocodb/src/models/Model.ts
+++ b/packages/nocodb/src/models/Model.ts
@@ -65,10 +65,14 @@ export default class Model implements TableType {
     Object.assign(this, data);
   }
 
-  public async getColumns(ncMeta = Noco.ncMeta): Promise<Column[]> {
+  public async getColumns(
+    ncMeta = Noco.ncMeta,
+    defaultViewId = undefined,
+  ): Promise<Column[]> {
     this.columns = await Column.list(
       {
         fk_model_id: this.id,
+        fk_default_view_id: defaultViewId,
       },
       ncMeta,
     );
@@ -391,8 +395,13 @@ export default class Model implements TableType {
     }
     if (modelData) {
       const m = new Model(modelData);
-      const columns = await m.getColumns(ncMeta);
+
       await m.getViews(false, ncMeta);
+
+      const defaultViewId = m.views.find((view) => view.is_default).id;
+
+      const columns = await m.getColumns(ncMeta, defaultViewId);
+
       m.columnsById = columns.reduce((agg, c) => ({ ...agg, [c.id]: c }), {});
       return m;
     }
diff --git a/packages/nocodb/src/models/UserRefreshToken.ts b/packages/nocodb/src/models/UserRefreshToken.ts
index ae4d805fd0..79c2602f78 100644
--- a/packages/nocodb/src/models/UserRefreshToken.ts
+++ b/packages/nocodb/src/models/UserRefreshToken.ts
@@ -1,4 +1,3 @@
-import process from 'process';
 import dayjs from 'dayjs';
 import Noco from '~/Noco';
 import { extractProps } from '~/helpers/extractProps';
@@ -69,6 +68,7 @@ export default class UserRefreshToken {
     return insertObj;
   }
 
+  // todo: caching
   static async updateOldToken(
     oldToken: string,
     newToken: string,
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index ab3453b1fe..97a12df9b1 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -545,6 +545,13 @@ export default class View implements ViewType {
     };
     const views = await this.list(param.fk_model_id, ncMeta);
 
+    const tableColumns = await Column.list(
+      { fk_model_id: param.fk_model_id },
+      ncMeta,
+    );
+    // keep a map of column id to column object for easy access
+    const colIdMap = new Map(tableColumns.map((c) => [c.id, c]));
+
     for (const view of views) {
       const modifiedInsertObj = {
         ...insertObj,
@@ -553,6 +560,26 @@ export default class View implements ViewType {
 
       if (param.column_show?.view_id === view.id) {
         modifiedInsertObj.show = true;
+      } else if (view.uuid) {
+        // if view is shared, then keep the show state as it is
+      }
+      // if gallery/kanban view, show only 3 columns(excluding system columns)
+      else if (view.type === ViewTypes.GALLERY) {
+        const visibleColumnsCount = (
+          await GalleryViewColumn.list(view.id, ncMeta)
+        )?.filter(
+          (c) => c.show && !isSystemColumn(colIdMap.get(c.fk_column_id)),
+        ).length;
+        modifiedInsertObj.show = visibleColumnsCount < 3;
+      } else if (view.type === ViewTypes.KANBAN) {
+        const visibleColumnsCount = (
+          await KanbanViewColumn.list(view.id, ncMeta)
+        )?.filter(
+          (c) => c.show && !isSystemColumn(colIdMap.get(c.fk_column_id)),
+        ).length;
+        modifiedInsertObj.show = visibleColumnsCount < 3;
+      } else if (view.type !== ViewTypes.FORM) {
+        modifiedInsertObj.show = true;
       }
 
       if (param.column_order?.view_id === view.id) {
diff --git a/packages/nocodb/src/services/users/helpers.ts b/packages/nocodb/src/services/users/helpers.ts
index c7826207d5..2b2ba15c2a 100644
--- a/packages/nocodb/src/services/users/helpers.ts
+++ b/packages/nocodb/src/services/users/helpers.ts
@@ -4,9 +4,13 @@ import type User from '~/models/User';
 import type { NcConfig } from '~/interface/config';
 import type { Response } from 'express';
 
-export function genJwt(user: User, config: NcConfig) {
+export function genJwt(
+  user: User & { extra?: Record<string, any> },
+  config: NcConfig,
+) {
   return jwt.sign(
     {
+      ...(user.extra || {}),
       email: user.email,
       id: user.id,
       roles: user.roles,
diff --git a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
index f666ac1b10..f01b5c42b4 100644
--- a/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
+++ b/packages/nocodb/src/strategies/authtoken.strategy/authtoken.strategy.ts
@@ -48,6 +48,9 @@ export class AuthTokenStrategy extends PassportStrategy(Strategy, 'authtoken') {
           ...(dbUser.workspace_roles
             ? { workspace_roles: extractRolesObj(dbUser.workspace_roles) }
             : {}),
+          ...(dbUser.org_roles
+            ? { org_roles: extractRolesObj(dbUser.org_roles) }
+            : {}),
         });
       }
       return callback(null, sanitiseUserObj(user));
diff --git a/packages/nocodb/tests/unit/rest/index.test.ts b/packages/nocodb/tests/unit/rest/index.test.ts
index 48a0444d02..b2eb831049 100644
--- a/packages/nocodb/tests/unit/rest/index.test.ts
+++ b/packages/nocodb/tests/unit/rest/index.test.ts
@@ -14,9 +14,11 @@ import formulaTests from './tests/formula.test';
 
 let workspaceTest = () => {};
 let ssoTest = () => {};
+let cloudOrgTest = () => {};
 if (process.env.EE === 'true') {
   workspaceTest = require('./tests/ee/workspace.test').default;
   ssoTest = require('./tests/ee/sso.test').default;
+  cloudOrgTest = require('./tests/ee/cloud-org.test').default;
 }
 // import layoutTests from './tests/layout.test';
 // import widgetTest from './tests/widget.test';
@@ -36,6 +38,7 @@ function restTests() {
   workspaceTest();
   formulaTests();
   ssoTest();
+  cloudOrgTest();
 
   // Enable for dashboard feature
   // widgetTest();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 56d8cdfdc0..24bd6ef9b2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,19 +53,19 @@ importers:
         version: 0.5.1(vue@3.3.13)
       '@tiptap/extension-link':
         specifier: 2.2.6
-        version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+        version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
       '@tiptap/extension-placeholder':
         specifier: ^2.2.6
-        version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+        version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
       '@tiptap/extension-task-list':
         specifier: 2.2.6
-        version: 2.2.6(@tiptap/core@2.2.5)
+        version: 2.2.6(@tiptap/core@2.3.1)
       '@tiptap/extension-underline':
         specifier: ^2.2.6
-        version: 2.2.6(@tiptap/core@2.2.5)
+        version: 2.2.6(@tiptap/core@2.3.1)
       '@tiptap/html':
         specifier: 2.2.6
-        version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+        version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
       '@tiptap/pm':
         specifier: ^2.2.6
         version: 2.2.6
@@ -74,7 +74,7 @@ importers:
         version: 2.2.6(@tiptap/pm@2.2.6)
       '@tiptap/vue-3':
         specifier: 2.2.6
-        version: 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)(vue@3.3.13)
+        version: 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)(vue@3.3.13)
       '@vue-flow/additional-components':
         specifier: ^1.3.3
         version: 1.3.3(@vue-flow/core@1.31.0)(vue@3.3.13)
@@ -243,7 +243,7 @@ importers:
         version: 0.26.3(eslint@8.56.0)
       '@esbuild-plugins/node-modules-polyfill':
         specifier: ^0.2.2
-        version: 0.2.2(esbuild@0.20.1)
+        version: 0.2.2(esbuild@0.20.2)
       '@iconify-json/ant-design':
         specifier: ^1.1.15
         version: 1.1.15
@@ -354,7 +354,7 @@ importers:
         version: 0.0.3
       '@unocss/nuxt':
         specifier: ^0.58.9
-        version: 0.58.9(postcss@8.4.35)(vite@4.5.3)(webpack@5.90.3)
+        version: 0.58.9(postcss@8.4.38)(vite@4.5.3)(webpack@5.91.0)
       '@vitest/ui':
         specifier: ^0.34.7
         version: 0.34.7(vitest@1.2.2)
@@ -402,7 +402,7 @@ importers:
         version: 1.71.1
       ts-loader:
         specifier: ^9.5.1
-        version: 9.5.1(webpack@5.90.3)
+        version: 9.5.1(webpack@5.91.0)
       unplugin-icons:
         specifier: ^0.18.5
         version: 0.18.5(@vue/compiler-sfc@3.4.21)
@@ -486,7 +486,7 @@ importers:
         version: 10.3.7(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/platform-socket.io@10.3.7)(reflect-metadata@0.2.1)(rxjs@7.8.1)
       '@ntegral/nestjs-sentry':
         specifier: ^4.0.1
-        version: 4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1)
+        version: 4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.113.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1)
       '@sentry/node':
         specifier: ^6.19.7
         version: 6.19.7
@@ -576,7 +576,7 @@ importers:
         version: 8.6.0
       ejs:
         specifier: ^3.1.9
-        version: 3.1.9
+        version: 3.1.10
       emittery:
         specifier: ^0.13.1
         version: 0.13.1
@@ -617,11 +617,11 @@ importers:
         specifier: ^1.13.4
         version: 1.13.4
       ioredis:
-        specifier: ^5.3.2
-        version: 5.3.2
+        specifier: ^5.4.1
+        version: 5.4.1
       ioredis-mock:
         specifier: ^8.9.0
-        version: 8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.3.2)
+        version: 8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.4.1)
       is-docker:
         specifier: ^2.2.1
         version: 2.2.1
@@ -699,7 +699,7 @@ importers:
         version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1)
       nestjs-throttler-storage-redis:
         specifier: ^0.4.4
-        version: 0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1)
+        version: 0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1)
       nocodb-sdk:
         specifier: workspace:^
         version: link:../nocodb-sdk
@@ -859,7 +859,7 @@ importers:
         version: 4.4.1
       copy-webpack-plugin:
         specifier: ^11.0.0
-        version: 11.0.0(webpack@5.90.3)
+        version: 11.0.0(webpack@5.91.0)
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
@@ -901,10 +901,10 @@ importers:
         version: 6.3.4
       ts-jest:
         specifier: 29.1.2
-        version: 29.1.2(@babel/core@7.24.3)(jest@29.7.0)(typescript@5.3.2)
+        version: 29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.2)
       ts-loader:
         specifier: ^9.5.1
-        version: 9.5.1(typescript@5.3.2)(webpack@5.90.3)
+        version: 9.5.1(typescript@5.3.2)(webpack@5.91.0)
       ts-node:
         specifier: ^10.9.2
         version: 10.9.2(@types/node@20.11.30)(typescript@5.3.2)
@@ -916,7 +916,7 @@ importers:
         version: 5.3.2
       webpack-cli:
         specifier: ^5.1.4
-        version: 5.1.4(webpack@5.90.3)
+        version: 5.1.4(webpack@5.91.0)
 
   packages/nocodb-sdk:
     dependencies:
@@ -971,7 +971,7 @@ importers:
         version: 5.0.5
       ts-jest:
         specifier: ^29.1.2
-        version: 29.1.2(@babel/core@7.24.3)(jest@29.7.0)(typescript@5.3.2)
+        version: 29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.2)
       tsc-alias:
         specifier: ^1.8.8
         version: 1.8.8
@@ -2688,6 +2688,29 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/core@7.24.5:
+    resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.24.2
+      '@babel/generator': 7.24.5
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-module-transforms': 7.24.5(@babel/core@7.24.5)
+      '@babel/helpers': 7.24.5
+      '@babel/parser': 7.24.5
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.5
+      '@babel/types': 7.24.5
+      convert-source-map: 2.0.0
+      debug: 4.3.4(supports-color@5.5.0)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/generator@7.24.1:
     resolution: {integrity: sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==}
     engines: {node: '>=6.9.0'}
@@ -2697,6 +2720,16 @@ packages:
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
+  /@babel/generator@7.24.5:
+    resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 2.5.2
+    dev: true
+
   /@babel/helper-annotate-as-pure@7.22.5:
     resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
     engines: {node: '>=6.9.0'}
@@ -2762,6 +2795,13 @@ packages:
     dependencies:
       '@babel/types': 7.24.0
 
+  /@babel/helper-module-imports@7.24.3:
+    resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
+    dev: true
+
   /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.3):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
@@ -2775,6 +2815,20 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/helper-validator-identifier': 7.22.20
 
+  /@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5):
+    resolution: {integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.24.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-module-imports': 7.24.3
+      '@babel/helper-simple-access': 7.24.5
+      '@babel/helper-split-export-declaration': 7.24.5
+      '@babel/helper-validator-identifier': 7.24.5
+    dev: true
+
   /@babel/helper-optimise-call-expression@7.22.5:
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
     engines: {node: '>=6.9.0'}
@@ -2805,6 +2859,13 @@ packages:
     dependencies:
       '@babel/types': 7.24.0
 
+  /@babel/helper-simple-access@7.24.5:
+    resolution: {integrity: sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
+    dev: true
+
   /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
     resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
     engines: {node: '>=6.9.0'}
@@ -2818,14 +2879,31 @@ packages:
     dependencies:
       '@babel/types': 7.24.0
 
+  /@babel/helper-split-export-declaration@7.24.5:
+    resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.24.5
+    dev: true
+
   /@babel/helper-string-parser@7.23.4:
     resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-string-parser@7.24.1:
+    resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /@babel/helper-validator-identifier@7.22.20:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-validator-identifier@7.24.5:
+    resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
   /@babel/helper-validator-option@7.23.5:
     resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
     engines: {node: '>=6.9.0'}
@@ -2840,6 +2918,17 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/helpers@7.24.5:
+    resolution: {integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.5
+      '@babel/types': 7.24.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/highlight@7.24.2:
     resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==}
     engines: {node: '>=6.9.0'}
@@ -2864,6 +2953,14 @@ packages:
     dependencies:
       '@babel/types': 7.24.0
 
+  /@babel/parser@7.24.5:
+    resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.24.5
+    dev: true
+
   /@babel/plugin-proposal-decorators@7.23.2(@babel/core@7.24.3):
     resolution: {integrity: sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg==}
     engines: {node: '>=6.9.0'}
@@ -3106,6 +3203,24 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/traverse@7.24.5:
+    resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.24.2
+      '@babel/generator': 7.24.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-split-export-declaration': 7.24.5
+      '@babel/parser': 7.24.5
+      '@babel/types': 7.24.5
+      debug: 4.3.4(supports-color@5.5.0)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/types@7.24.0:
     resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
     engines: {node: '>=6.9.0'}
@@ -3114,6 +3229,15 @@ packages:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
+  /@babel/types@7.24.5:
+    resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.24.1
+      '@babel/helper-validator-identifier': 7.24.5
+      to-fast-properties: 2.0.0
+    dev: true
+
   /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
@@ -3342,12 +3466,12 @@ packages:
     dev: false
     optional: true
 
-  /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.1):
+  /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.2):
     resolution: {integrity: sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==}
     peerDependencies:
       esbuild: '*'
     dependencies:
-      esbuild: 0.20.1
+      esbuild: 0.20.2
       escape-string-regexp: 4.0.0
       rollup-plugin-node-polyfills: 0.2.1
     dev: true
@@ -3370,6 +3494,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/aix-ppc64@0.20.2:
+    resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm64@0.18.20:
     resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
     engines: {node: '>=12'}
@@ -3397,6 +3530,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm64@0.20.2:
+    resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm@0.18.20:
     resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
     engines: {node: '>=12'}
@@ -3424,6 +3566,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm@0.20.2:
+    resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-x64@0.18.20:
     resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
     engines: {node: '>=12'}
@@ -3451,6 +3602,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-x64@0.20.2:
+    resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-arm64@0.18.20:
     resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
     engines: {node: '>=12'}
@@ -3478,6 +3638,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/darwin-arm64@0.20.2:
+    resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-x64@0.18.20:
     resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
     engines: {node: '>=12'}
@@ -3505,6 +3674,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/darwin-x64@0.20.2:
+    resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-arm64@0.18.20:
     resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
     engines: {node: '>=12'}
@@ -3532,6 +3710,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/freebsd-arm64@0.20.2:
+    resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-x64@0.18.20:
     resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
     engines: {node: '>=12'}
@@ -3559,6 +3746,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/freebsd-x64@0.20.2:
+    resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm64@0.18.20:
     resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
     engines: {node: '>=12'}
@@ -3586,6 +3782,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-arm64@0.20.2:
+    resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm@0.18.20:
     resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
     engines: {node: '>=12'}
@@ -3613,6 +3818,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-arm@0.20.2:
+    resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ia32@0.18.20:
     resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
     engines: {node: '>=12'}
@@ -3640,6 +3854,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-ia32@0.20.2:
+    resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-loong64@0.18.20:
     resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
     engines: {node: '>=12'}
@@ -3667,6 +3890,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-loong64@0.20.2:
+    resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-mips64el@0.18.20:
     resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
     engines: {node: '>=12'}
@@ -3694,6 +3926,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-mips64el@0.20.2:
+    resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ppc64@0.18.20:
     resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
     engines: {node: '>=12'}
@@ -3721,6 +3962,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-ppc64@0.20.2:
+    resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-riscv64@0.18.20:
     resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
     engines: {node: '>=12'}
@@ -3748,6 +3998,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-riscv64@0.20.2:
+    resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-s390x@0.18.20:
     resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
     engines: {node: '>=12'}
@@ -3775,6 +4034,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-s390x@0.20.2:
+    resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-x64@0.18.20:
     resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
     engines: {node: '>=12'}
@@ -3802,6 +4070,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-x64@0.20.2:
+    resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/netbsd-x64@0.18.20:
     resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
     engines: {node: '>=12'}
@@ -3829,6 +4106,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/netbsd-x64@0.20.2:
+    resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/openbsd-x64@0.18.20:
     resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
     engines: {node: '>=12'}
@@ -3856,6 +4142,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/openbsd-x64@0.20.2:
+    resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/sunos-x64@0.18.20:
     resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
     engines: {node: '>=12'}
@@ -3883,6 +4178,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/sunos-x64@0.20.2:
+    resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-arm64@0.18.20:
     resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
     engines: {node: '>=12'}
@@ -3910,6 +4214,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-arm64@0.20.2:
+    resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-ia32@0.18.20:
     resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
     engines: {node: '>=12'}
@@ -3937,6 +4250,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-ia32@0.20.2:
+    resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-x64@0.18.20:
     resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
     engines: {node: '>=12'}
@@ -3964,6 +4286,15 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/win32-x64@0.20.2:
+    resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@eslint-community/eslint-utils@4.4.0(eslint@8.33.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5127,7 +5458,7 @@ packages:
     resolution: {integrity: sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==}
     engines: {node: '>=16.0.0'}
     dependencies:
-      chalk: 4.1.2
+      chalk: 4.1.0
       execa: 5.1.1
       strong-log-transformer: 2.1.0
     dev: true
@@ -5885,7 +6216,7 @@ packages:
       - debug
     dev: true
 
-  /@ntegral/nestjs-sentry@4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1):
+  /@ntegral/nestjs-sentry@4.0.1(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@sentry/hub@7.113.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1):
     resolution: {integrity: sha512-GQUL0Bm0T+FhTNJXUbnF5mZc2u5YuvUV2H6naXxrnw8tY0b9eE/DGj+GUyHNL7V2DuHHFzsYP2c30O5FoGoYfQ==}
     peerDependencies:
       '@nestjs/common': '>=10.0.0'
@@ -5898,7 +6229,7 @@ packages:
     dependencies:
       '@nestjs/common': 10.3.7(reflect-metadata@0.2.1)(rxjs@7.8.1)
       '@nestjs/core': 10.3.7(@nestjs/common@10.3.7)(@nestjs/platform-express@10.3.7)(@nestjs/websockets@10.3.7)(reflect-metadata@0.2.1)(rxjs@7.8.1)
-      '@sentry/hub': 7.103.0
+      '@sentry/hub': 7.113.0
       '@sentry/node': 6.19.7
       reflect-metadata: 0.2.1
       rimraf: 3.0.2
@@ -6378,7 +6709,7 @@ packages:
       nx: '>= 15 <= 17'
     dependencies:
       '@nrwl/devkit': 16.7.4(nx@16.7.4)
-      ejs: 3.1.9
+      ejs: 3.1.10
       enquirer: 2.3.6
       ignore: 5.3.1
       nx: 16.7.4
@@ -7227,12 +7558,12 @@ packages:
       tslib: 1.14.1
     dev: false
 
-  /@sentry/core@7.103.0:
-    resolution: {integrity: sha512-LCI+PIDoF/RLqN41fNXum3ilmS6ukni6L7t38vSdibbe2G0804EbPLtOIpv2PkS8E6CFuRW5zOb+8OwEAAtZWw==}
+  /@sentry/core@7.113.0:
+    resolution: {integrity: sha512-pg75y3C5PG2+ur27A0Re37YTCEnX0liiEU7EOxWDGutH17x3ySwlYqLQmZsFZTSnvzv7t3MGsNZ8nT5O0746YA==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/types': 7.103.0
-      '@sentry/utils': 7.103.0
+      '@sentry/types': 7.113.0
+      '@sentry/utils': 7.113.0
     dev: false
 
   /@sentry/hub@6.19.7:
@@ -7244,13 +7575,13 @@ packages:
       tslib: 1.14.1
     dev: false
 
-  /@sentry/hub@7.103.0:
-    resolution: {integrity: sha512-61o906jj5i2T9iUeFy/UwisLaCYt5SMU6i64w3pbFM4CJJRsufc+zcrSDfngLJMYOawlXJPa85iekBEkfpOzzQ==}
+  /@sentry/hub@7.113.0:
+    resolution: {integrity: sha512-aoerhlAw3vnY9a27eKAoK862oMXFbyMFWbaZuCeR5gfg7sHsOkVQkCl3yiYfF5hfw9MbwbbY6GqWbCrA89Ci/A==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/core': 7.103.0
-      '@sentry/types': 7.103.0
-      '@sentry/utils': 7.103.0
+      '@sentry/core': 7.113.0
+      '@sentry/types': 7.113.0
+      '@sentry/utils': 7.113.0
     dev: false
 
   /@sentry/minimal@6.19.7:
@@ -7283,8 +7614,8 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /@sentry/types@7.103.0:
-    resolution: {integrity: sha512-NCvKyx8d2AGBQKPARrJemZmZ16DiMo688OEikZg4BbvFNDUzK5Egm2BH0vfLDhbNkU19o3maJowrYo42m8r9Zw==}
+  /@sentry/types@7.113.0:
+    resolution: {integrity: sha512-PJbTbvkcPu/LuRwwXB1He8m+GjDDLKBtu3lWg5xOZaF5IRdXQU2xwtdXXsjge4PZR00tF7MO7X8ZynTgWbYaew==}
     engines: {node: '>=8'}
     dev: false
 
@@ -7296,11 +7627,11 @@ packages:
       tslib: 1.14.1
     dev: false
 
-  /@sentry/utils@7.103.0:
-    resolution: {integrity: sha512-phkUJt3F0UOkVq+M4GfdAh2ewI3ASrNiJddx9aO7GnT0aDwwVBHZltnqt95qgAB8W+BipTSt1dAh8yUbbq1Ceg==}
+  /@sentry/utils@7.113.0:
+    resolution: {integrity: sha512-nzKsErwmze1mmEsbW2AwL2oB+I5v6cDEJY4sdfLekA4qZbYZ8pV5iWza6IRl4XfzGTE1qpkZmEjPU9eyo0yvYw==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/types': 7.103.0
+      '@sentry/types': 7.113.0
     dev: false
 
   /@sigstore/bundle@1.1.0:
@@ -8362,7 +8693,7 @@ packages:
       asn1.js: 5.4.1
       asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
       asn1.js-rfc5280: 3.0.0
-      async: 3.2.4
+      async: 3.2.5
       simple-lru-cache: 0.0.2
     dev: false
 
@@ -8370,16 +8701,16 @@ packages:
     resolution: {integrity: sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ==}
     dev: false
 
-  /@tiptap/core@2.2.5(@tiptap/pm@2.2.6):
-    resolution: {integrity: sha512-BgF6tiXhwph0Ig16ZNppMmg30t22Z/yjZ+KnS8EALdJere3ACNw8THz9q/8iQqBWjjBOHUvhrQOgER4BJxfmGA==}
+  /@tiptap/core@2.2.6(@tiptap/pm@2.2.6):
+    resolution: {integrity: sha512-v7S7RhQhTXQo9KSk2jM/jJlTd3clU2FsJA3Omjz7GbgYtPSy67qSiaTbH/tWq12GzDHbKymx+oQnKmyx+yPucA==}
     peerDependencies:
       '@tiptap/pm': ^2.0.0
     dependencies:
       '@tiptap/pm': 2.2.6
     dev: false
 
-  /@tiptap/core@2.2.6(@tiptap/pm@2.2.6):
-    resolution: {integrity: sha512-v7S7RhQhTXQo9KSk2jM/jJlTd3clU2FsJA3Omjz7GbgYtPSy67qSiaTbH/tWq12GzDHbKymx+oQnKmyx+yPucA==}
+  /@tiptap/core@2.3.1(@tiptap/pm@2.2.6):
+    resolution: {integrity: sha512-ycpQlmczAOc05TgB5sc3RUTEEBXAVmS8MR9PqQzg96qidaRfVkgE+2w4k7t83PMHl2duC0MGqOCy96pLYwSpeg==}
     peerDependencies:
       '@tiptap/pm': ^2.0.0
     dependencies:
@@ -8402,13 +8733,13 @@ packages:
       '@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
     dev: false
 
-  /@tiptap/extension-bubble-menu@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+  /@tiptap/extension-bubble-menu@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
     resolution: {integrity: sha512-nRWxbgkInhdGUL+e6iISgALcWh8A1PxeVB66w7yYZHS/WoZO0DXdXYT/BWb/XmEJ8r6B4c9SDZRklCiXT8dSXw==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
       '@tiptap/pm': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
       '@tiptap/pm': 2.2.6
       tippy.js: 6.3.7
     dev: false
@@ -8457,13 +8788,13 @@ packages:
       '@tiptap/pm': 2.2.6
     dev: false
 
-  /@tiptap/extension-floating-menu@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+  /@tiptap/extension-floating-menu@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
     resolution: {integrity: sha512-6ONKC6Dx8zCc5YffXpnQ9FxGRoUp5Jm9mOO3losgiDFhdJqaO7SCk1ziOiD7enoWqIc2shZh8ADnqttCfnFVFQ==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
       '@tiptap/pm': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
       '@tiptap/pm': 2.2.6
       tippy.js: 6.3.7
     dev: false
@@ -8522,13 +8853,13 @@ packages:
       '@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
     dev: false
 
-  /@tiptap/extension-link@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+  /@tiptap/extension-link@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
     resolution: {integrity: sha512-Jj0oXSfQ8gZlzzwd669B8sEKBkoK8xV31Lu55tRv9PKHSU6p9CUqBuxY8qR+cquCtO28f3u0cdl5o4HzeIUL5A==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
       '@tiptap/pm': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
       '@tiptap/pm': 2.2.6
       linkifyjs: 4.1.3
     dev: false
@@ -8557,13 +8888,13 @@ packages:
       '@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
     dev: false
 
-  /@tiptap/extension-placeholder@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+  /@tiptap/extension-placeholder@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
     resolution: {integrity: sha512-eHPadx48gneDD8bTZeRnG4hOvRvctBPY5JlA03QQIoarrbmqsyv3zZSW8smBsRai9kwbXLhytdEFGruTKV9PjQ==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
       '@tiptap/pm': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
       '@tiptap/pm': 2.2.6
     dev: false
 
@@ -8575,12 +8906,12 @@ packages:
       '@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
     dev: false
 
-  /@tiptap/extension-task-list@2.2.6(@tiptap/core@2.2.5):
+  /@tiptap/extension-task-list@2.2.6(@tiptap/core@2.3.1):
     resolution: {integrity: sha512-4ofrnm0jwk9OC5QH+b5wR4ck+J5wi+uOq7Qm2234GAqohjOzr4ndae68NSIv2XviDk04askCoZc+yZBxNwkhmQ==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
     dev: false
 
   /@tiptap/extension-text@2.2.6(@tiptap/core@2.2.6):
@@ -8591,21 +8922,21 @@ packages:
       '@tiptap/core': 2.2.6(@tiptap/pm@2.2.6)
     dev: false
 
-  /@tiptap/extension-underline@2.2.6(@tiptap/core@2.2.5):
+  /@tiptap/extension-underline@2.2.6(@tiptap/core@2.3.1):
     resolution: {integrity: sha512-RaYEWuBHS6VQ2KXk+pP2b3xDN4vxmTb7+CF84mumR+CJUK4uAx01IDBUof+h/a4Sa58suNLQ6eHY33NmxPppnQ==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
     dev: false
 
-  /@tiptap/html@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6):
+  /@tiptap/html@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6):
     resolution: {integrity: sha512-RdZ5Zr2b+LShyKaQKlWB3eLSzznH54Er8/78wKLuudE2xiUS1t25O1YgIrGUA1AFC1woSPJsS1uEvxwvKqE6eg==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
       '@tiptap/pm': ^2.0.0
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
       '@tiptap/pm': 2.2.6
       zeed-dom: 0.10.11
     dev: false
@@ -8659,16 +8990,16 @@ packages:
       - '@tiptap/pm'
     dev: false
 
-  /@tiptap/vue-3@2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)(vue@3.3.13):
+  /@tiptap/vue-3@2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)(vue@3.3.13):
     resolution: {integrity: sha512-F8hC133AF/48cvZReJun5TV35NtRcoH8LVEGsuHGNkH7BvJjXAciomvEO4HlSfqz1YT8M/hzRGNg1/R6ixv3bw==}
     peerDependencies:
       '@tiptap/core': ^2.0.0
       '@tiptap/pm': ^2.0.0
       vue: 3.3.13
     dependencies:
-      '@tiptap/core': 2.2.5(@tiptap/pm@2.2.6)
-      '@tiptap/extension-bubble-menu': 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
-      '@tiptap/extension-floating-menu': 2.2.6(@tiptap/core@2.2.5)(@tiptap/pm@2.2.6)
+      '@tiptap/core': 2.3.1(@tiptap/pm@2.2.6)
+      '@tiptap/extension-bubble-menu': 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
+      '@tiptap/extension-floating-menu': 2.2.6(@tiptap/core@2.3.1)(@tiptap/pm@2.2.6)
       '@tiptap/pm': 2.2.6
       vue: 3.3.13
     dev: false
@@ -8719,7 +9050,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
       '@tufjs/canonical-json': 1.0.0
-      minimatch: 9.0.3
+      minimatch: 9.0.4
     dev: true
 
   /@tufjs/models@2.0.0:
@@ -8727,7 +9058,7 @@ packages:
     engines: {node: ^16.14.0 || >=18.0.0}
     dependencies:
       '@tufjs/canonical-json': 2.0.0
-      minimatch: 9.0.3
+      minimatch: 9.0.4
     dev: true
 
   /@types/babel__core@7.20.1:
@@ -8832,7 +9163,7 @@ packages:
   /@types/eslint-scope@3.7.7:
     resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
     dependencies:
-      '@types/eslint': 8.56.5
+      '@types/eslint': 8.56.10
       '@types/estree': 1.0.5
     dev: true
 
@@ -8843,8 +9174,8 @@ packages:
       '@types/json-schema': 7.0.12
     dev: true
 
-  /@types/eslint@8.56.5:
-    resolution: {integrity: sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==}
+  /@types/eslint@8.56.10:
+    resolution: {integrity: sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==}
     dependencies:
       '@types/estree': 1.0.5
       '@types/json-schema': 7.0.15
@@ -8912,7 +9243,7 @@ packages:
     resolution: {integrity: sha512-cZyuwC9LGtg7s5G9/w6rpy3IOZ6F/hFR0pQlWYZESMo1xQUYbDpa6haqB4grTePjsGzcB/YLBFCjqRunK5wieg==}
     dependencies:
       '@types/node': 20.11.30
-      ioredis: 5.3.2
+      ioredis: 5.4.1
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -9788,7 +10119,7 @@ packages:
       sirv: 2.0.4
     dev: true
 
-  /@unocss/nuxt@0.58.9(postcss@8.4.35)(vite@4.5.3)(webpack@5.90.3):
+  /@unocss/nuxt@0.58.9(postcss@8.4.38)(vite@4.5.3)(webpack@5.91.0):
     resolution: {integrity: sha512-zrzbpNjjstiXsjfRCwBt0ZDMquTPqAWry6OT1Z8YUeRmQ2YuPNJDnvUSWZuA5zYbXjMjuCTtX+jkHctMIabOYA==}
     dependencies:
       '@nuxt/kit': 3.11.1
@@ -9803,8 +10134,8 @@ packages:
       '@unocss/preset-wind': 0.58.9
       '@unocss/reset': 0.58.9
       '@unocss/vite': 0.58.9(vite@4.5.3)
-      '@unocss/webpack': 0.58.9(webpack@5.90.3)
-      unocss: 0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.35)(vite@4.5.3)
+      '@unocss/webpack': 0.58.9(webpack@5.91.0)
+      unocss: 0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.38)(vite@4.5.3)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -9813,7 +10144,7 @@ packages:
       - webpack
     dev: true
 
-  /@unocss/postcss@0.58.9(postcss@8.4.35):
+  /@unocss/postcss@0.58.9(postcss@8.4.38):
     resolution: {integrity: sha512-PnKmH6Qhimw35yO6u6yx9SHaX2NmvbRNPDvMDHA/1xr3M8L0o8U88tgKbWfm65NEGF3R1zJ9A8rjtZn/LPkgPA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -9825,7 +10156,7 @@ packages:
       css-tree: 2.3.1
       fast-glob: 3.3.2
       magic-string: 0.30.8
-      postcss: 8.4.35
+      postcss: 8.4.38
     dev: true
 
   /@unocss/preset-attributify@0.58.9:
@@ -9962,7 +10293,7 @@ packages:
       - rollup
     dev: true
 
-  /@unocss/webpack@0.58.9(webpack@5.90.3):
+  /@unocss/webpack@0.58.9(webpack@5.91.0):
     resolution: {integrity: sha512-BCIocoGRRvrB3jqrUZwzBFA2pVgxQr2XzVFU6t8yZQqVVkaKxAjZQ5eLxj5OlZIiSPzfRc4OR73k2Pj6DC/3Og==}
     peerDependencies:
       webpack: ^4 || ^5
@@ -9975,7 +10306,7 @@ packages:
       fast-glob: 3.3.2
       magic-string: 0.30.8
       unplugin: 1.10.1
-      webpack: 5.90.3(esbuild@0.20.1)
+      webpack: 5.91.0(esbuild@0.20.2)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - rollup
@@ -10471,6 +10802,13 @@ packages:
       '@webassemblyjs/helper-wasm-bytecode': 1.11.6
     dev: true
 
+  /@webassemblyjs/ast@1.12.1:
+    resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
+    dependencies:
+      '@webassemblyjs/helper-numbers': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+    dev: true
+
   /@webassemblyjs/floating-point-hex-parser@1.11.6:
     resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==}
     dev: true
@@ -10483,6 +10821,10 @@ packages:
     resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==}
     dev: true
 
+  /@webassemblyjs/helper-buffer@1.12.1:
+    resolution: {integrity: sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==}
+    dev: true
+
   /@webassemblyjs/helper-numbers@1.11.6:
     resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==}
     dependencies:
@@ -10504,6 +10846,15 @@ packages:
       '@webassemblyjs/wasm-gen': 1.11.6
     dev: true
 
+  /@webassemblyjs/helper-wasm-section@1.12.1:
+    resolution: {integrity: sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==}
+    dependencies:
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/helper-buffer': 1.12.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.12.1
+    dev: true
+
   /@webassemblyjs/ieee754@1.11.6:
     resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==}
     dependencies:
@@ -10533,6 +10884,19 @@ packages:
       '@webassemblyjs/wast-printer': 1.11.6
     dev: true
 
+  /@webassemblyjs/wasm-edit@1.12.1:
+    resolution: {integrity: sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==}
+    dependencies:
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/helper-buffer': 1.12.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/helper-wasm-section': 1.12.1
+      '@webassemblyjs/wasm-gen': 1.12.1
+      '@webassemblyjs/wasm-opt': 1.12.1
+      '@webassemblyjs/wasm-parser': 1.12.1
+      '@webassemblyjs/wast-printer': 1.12.1
+    dev: true
+
   /@webassemblyjs/wasm-gen@1.11.6:
     resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==}
     dependencies:
@@ -10543,6 +10907,16 @@ packages:
       '@webassemblyjs/utf8': 1.11.6
     dev: true
 
+  /@webassemblyjs/wasm-gen@1.12.1:
+    resolution: {integrity: sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==}
+    dependencies:
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/ieee754': 1.11.6
+      '@webassemblyjs/leb128': 1.11.6
+      '@webassemblyjs/utf8': 1.11.6
+    dev: true
+
   /@webassemblyjs/wasm-opt@1.11.6:
     resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==}
     dependencies:
@@ -10552,6 +10926,15 @@ packages:
       '@webassemblyjs/wasm-parser': 1.11.6
     dev: true
 
+  /@webassemblyjs/wasm-opt@1.12.1:
+    resolution: {integrity: sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==}
+    dependencies:
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/helper-buffer': 1.12.1
+      '@webassemblyjs/wasm-gen': 1.12.1
+      '@webassemblyjs/wasm-parser': 1.12.1
+    dev: true
+
   /@webassemblyjs/wasm-parser@1.11.6:
     resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==}
     dependencies:
@@ -10563,6 +10946,17 @@ packages:
       '@webassemblyjs/utf8': 1.11.6
     dev: true
 
+  /@webassemblyjs/wasm-parser@1.12.1:
+    resolution: {integrity: sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==}
+    dependencies:
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/helper-api-error': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/ieee754': 1.11.6
+      '@webassemblyjs/leb128': 1.11.6
+      '@webassemblyjs/utf8': 1.11.6
+    dev: true
+
   /@webassemblyjs/wast-printer@1.11.6:
     resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==}
     dependencies:
@@ -10570,29 +10964,36 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.90.3):
+  /@webassemblyjs/wast-printer@1.12.1:
+    resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==}
+    dependencies:
+      '@webassemblyjs/ast': 1.12.1
+      '@xtuc/long': 4.2.2
+    dev: true
+
+  /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.91.0):
     resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.90.3(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack@5.90.3)
+      webpack: 5.91.0(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack@5.91.0)
     dev: true
 
-  /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.90.3):
+  /@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.91.0):
     resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.90.3(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack@5.90.3)
+      webpack: 5.91.0(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack@5.91.0)
     dev: true
 
-  /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack@5.90.3):
+  /@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack@5.91.0):
     resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
@@ -10603,8 +11004,8 @@ packages:
       webpack-dev-server:
         optional: true
     dependencies:
-      webpack: 5.90.3(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack@5.90.3)
+      webpack: 5.91.0(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack@5.91.0)
     dev: true
 
   /@windicss/config@1.9.1:
@@ -11040,7 +11441,7 @@ packages:
     engines: {node: '>= 12.0.0'}
     dependencies:
       archiver-utils: 4.0.1
-      async: 3.2.4
+      async: 3.2.5
       buffer-crc32: 0.2.13
       readable-stream: 3.6.2
       readdir-glob: 1.1.3
@@ -11326,6 +11727,10 @@ packages:
 
   /async@3.2.4:
     resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
+    dev: false
+
+  /async@3.2.5:
+    resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==}
 
   /asynciterator.prototype@1.0.0:
     resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==}
@@ -11838,7 +12243,7 @@ packages:
     dependencies:
       cron-parser: 4.9.0
       get-port: 5.1.1
-      ioredis: 5.3.2
+      ioredis: 5.4.1
       lodash: 4.17.21
       msgpackr: 1.10.1
       semver: 7.5.4
@@ -11853,7 +12258,7 @@ packages:
       cron-parser: 4.9.0
       get-port: 6.1.2
       glob: 8.1.0
-      ioredis: 5.3.2
+      ioredis: 5.4.1
       lodash: 4.17.21
       msgpackr: 1.9.7
       semver: 7.5.4
@@ -12811,7 +13216,7 @@ packages:
     resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
     dev: false
 
-  /copy-webpack-plugin@11.0.0(webpack@5.90.3):
+  /copy-webpack-plugin@11.0.0(webpack@5.91.0):
     resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==}
     engines: {node: '>= 14.15.0'}
     peerDependencies:
@@ -12823,7 +13228,7 @@ packages:
       normalize-path: 3.0.0
       schema-utils: 4.2.0
       serialize-javascript: 6.0.1
-      webpack: 5.90.3(webpack-cli@5.1.4)
+      webpack: 5.91.0(webpack-cli@5.1.4)
     dev: true
 
   /core-js@3.32.1:
@@ -13811,8 +14216,8 @@ packages:
   /ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  /ejs@3.1.9:
-    resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}
+  /ejs@3.1.10:
+    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
     engines: {node: '>=0.10.0'}
     hasBin: true
     dependencies:
@@ -13931,8 +14336,8 @@ packages:
       tapable: 2.2.1
     dev: true
 
-  /enhanced-resolve@5.15.1:
-    resolution: {integrity: sha512-3d3JRbwsCLJsYgvb6NuWEG44jjPSOMuS73L/6+7BZuoKm3W+qXnSoIYVHi8dG7Qcg4inAY4jbzkZ7MnskePeDg==}
+  /enhanced-resolve@5.16.0:
+    resolution: {integrity: sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==}
     engines: {node: '>=10.13.0'}
     dependencies:
       graceful-fs: 4.2.11
@@ -14130,8 +14535,8 @@ packages:
     resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==}
     dev: true
 
-  /es-module-lexer@1.4.1:
-    resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==}
+  /es-module-lexer@1.5.2:
+    resolution: {integrity: sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==}
     dev: true
 
   /es-set-tostringtag@2.0.1:
@@ -14263,6 +14668,37 @@ packages:
       '@esbuild/win32-x64': 0.20.1
     dev: true
 
+  /esbuild@0.20.2:
+    resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.20.2
+      '@esbuild/android-arm': 0.20.2
+      '@esbuild/android-arm64': 0.20.2
+      '@esbuild/android-x64': 0.20.2
+      '@esbuild/darwin-arm64': 0.20.2
+      '@esbuild/darwin-x64': 0.20.2
+      '@esbuild/freebsd-arm64': 0.20.2
+      '@esbuild/freebsd-x64': 0.20.2
+      '@esbuild/linux-arm': 0.20.2
+      '@esbuild/linux-arm64': 0.20.2
+      '@esbuild/linux-ia32': 0.20.2
+      '@esbuild/linux-loong64': 0.20.2
+      '@esbuild/linux-mips64el': 0.20.2
+      '@esbuild/linux-ppc64': 0.20.2
+      '@esbuild/linux-riscv64': 0.20.2
+      '@esbuild/linux-s390x': 0.20.2
+      '@esbuild/linux-x64': 0.20.2
+      '@esbuild/netbsd-x64': 0.20.2
+      '@esbuild/openbsd-x64': 0.20.2
+      '@esbuild/sunos-x64': 0.20.2
+      '@esbuild/win32-arm64': 0.20.2
+      '@esbuild/win32-ia32': 0.20.2
+      '@esbuild/win32-x64': 0.20.2
+    dev: true
+
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
@@ -16189,7 +16625,7 @@ packages:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.3.6
-      minimatch: 9.0.3
+      minimatch: 9.0.4
       minipass: 7.0.3
       path-scurry: 1.10.1
     dev: true
@@ -16200,7 +16636,7 @@ packages:
       fs.realpath: 1.0.0
       inflight: 1.0.6
       inherits: 2.0.4
-      minimatch: 3.1.2
+      minimatch: 3.0.5
       once: 1.4.0
       path-is-absolute: 1.0.1
     dev: true
@@ -16222,7 +16658,7 @@ packages:
       fs.realpath: 1.0.0
       inflight: 1.0.6
       inherits: 2.0.4
-      minimatch: 5.1.6
+      minimatch: 5.0.1
       once: 1.4.0
 
   /glob@9.3.5:
@@ -16914,7 +17350,7 @@ packages:
     resolution: {integrity: sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
     dependencies:
-      minimatch: 9.0.3
+      minimatch: 9.0.4
     dev: true
 
   /ignore@5.2.4:
@@ -17099,7 +17535,7 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /ioredis-mock@8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.3.2):
+  /ioredis-mock@8.9.0(@types/ioredis-mock@8.2.5)(ioredis@5.4.1):
     resolution: {integrity: sha512-yIglcCkI1lvhwJVoMsR51fotZVsPsSk07ecTCgRTRlicG0Vq3lke6aAaHklyjmRNRsdYAgswqC2A0bPtQK4LSw==}
     engines: {node: '>=12.22'}
     peerDependencies:
@@ -17111,12 +17547,12 @@ packages:
       '@types/ioredis-mock': 8.2.5
       fengari: 0.1.4
       fengari-interop: 0.1.3(fengari@0.1.4)
-      ioredis: 5.3.2
+      ioredis: 5.4.1
       semver: 7.5.4
     dev: false
 
-  /ioredis@5.3.2:
-    resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
+  /ioredis@5.4.1:
+    resolution: {integrity: sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==}
     engines: {node: '>=12.22.0'}
     dependencies:
       '@ioredis/commands': 1.2.0
@@ -17816,7 +18252,7 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      async: 3.2.4
+      async: 3.2.5
       chalk: 4.1.2
       filelist: 1.0.4
       minimatch: 3.1.2
@@ -17932,7 +18368,7 @@ packages:
     resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      chalk: 4.1.2
+      chalk: 4.1.0
       diff-sequences: 29.6.3
       jest-get-type: 29.6.3
       pretty-format: 29.7.0
@@ -19594,7 +20030,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
-    dev: true
 
   /minimatch@5.1.6:
     resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
@@ -19623,6 +20058,13 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
+  /minimatch@9.0.4:
+    resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
@@ -19971,7 +20413,7 @@ packages:
       array-differ: 3.0.0
       array-union: 2.1.0
       arrify: 2.0.1
-      minimatch: 3.1.2
+      minimatch: 3.0.5
     dev: true
 
   /mute-stream@0.0.8:
@@ -20136,7 +20578,7 @@ packages:
       - reflect-metadata
     dev: false
 
-  /nestjs-throttler-storage-redis@0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1):
+  /nestjs-throttler-storage-redis@0.4.4(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1):
     resolution: {integrity: sha512-QLYfsat/qutHQaTn3QAoa79WEHG4Uyk8rWRqNhVCVxzQ+qdzaNBUlBwxb8MYhfCmgoCA+eX3Paws8FZI/bYe7A==}
     peerDependencies:
       '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
@@ -20148,7 +20590,7 @@ packages:
       '@nestjs/common': 10.3.7(reflect-metadata@0.2.1)(rxjs@7.8.1)
       '@nestjs/core': 10.3.7(@nestjs/common@10.3.7)(@nestjs/platform-express@10.3.7)(@nestjs/websockets@10.3.7)(reflect-metadata@0.2.1)(rxjs@7.8.1)
       '@nestjs/throttler': 5.1.2(@nestjs/common@10.3.7)(@nestjs/core@10.3.7)(reflect-metadata@0.2.1)
-      ioredis: 5.3.2
+      ioredis: 5.4.1
       reflect-metadata: 0.2.1
     dev: false
 
@@ -20849,7 +21291,7 @@ packages:
       '@yarnpkg/parsers': 3.0.0-rc.46
       '@zkochan/js-yaml': 0.0.6
       axios: 1.6.8(debug@3.2.7)
-      chalk: 4.1.2
+      chalk: 4.1.0
       cli-cursor: 3.1.0
       cli-spinners: 2.6.1
       cliui: 7.0.4
@@ -22132,6 +22574,15 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
+  /postcss@8.4.38:
+    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.2.0
+    dev: true
+
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
@@ -23815,6 +24266,11 @@ packages:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
 
+  /source-map-js@1.2.0:
+    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /source-map-support@0.5.13:
     resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
     dependencies:
@@ -23917,6 +24373,9 @@ packages:
   /sqlite3@5.1.6:
     resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==}
     requiresBuild: true
+    peerDependenciesMeta:
+      node-gyp:
+        optional: true
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.11
       node-addon-api: 4.3.0
@@ -23931,6 +24390,9 @@ packages:
   /sqlite3@5.1.7:
     resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
     requiresBuild: true
+    peerDependenciesMeta:
+      node-gyp:
+        optional: true
     dependencies:
       bindings: 1.5.0
       node-addon-api: 7.0.0
@@ -24566,7 +25028,7 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /terser-webpack-plugin@5.3.10(esbuild@0.20.1)(webpack@5.90.3):
+  /terser-webpack-plugin@5.3.10(esbuild@0.20.2)(webpack@5.91.0):
     resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -24583,12 +25045,12 @@ packages:
         optional: true
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      esbuild: 0.20.1
+      esbuild: 0.20.2
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.1
       terser: 5.27.0
-      webpack: 5.90.3(esbuild@0.20.1)
+      webpack: 5.91.0(esbuild@0.20.2)
     dev: true
 
   /terser-webpack-plugin@5.3.10(webpack@5.90.1):
@@ -24615,7 +25077,7 @@ packages:
       webpack: 5.90.1(webpack-cli@5.1.4)
     dev: true
 
-  /terser-webpack-plugin@5.3.10(webpack@5.90.3):
+  /terser-webpack-plugin@5.3.10(webpack@5.91.0):
     resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -24636,7 +25098,7 @@ packages:
       schema-utils: 3.3.0
       serialize-javascript: 6.0.1
       terser: 5.27.0
-      webpack: 5.90.3(webpack-cli@5.1.4)
+      webpack: 5.91.0(webpack-cli@5.1.4)
     dev: true
 
   /terser@5.27.0:
@@ -24852,7 +25314,7 @@ packages:
     engines: {node: '>=14.0.0'}
     dev: false
 
-  /ts-jest@29.1.2(@babel/core@7.24.3)(jest@29.7.0)(typescript@5.3.2):
+  /ts-jest@29.1.2(@babel/core@7.24.5)(jest@29.7.0)(typescript@5.3.2):
     resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==}
     engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -24873,7 +25335,7 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.24.3
+      '@babel/core': 7.24.5
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
       jest: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2)
@@ -24886,7 +25348,7 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-loader@9.5.1(typescript@5.3.2)(webpack@5.90.3):
+  /ts-loader@9.5.1(typescript@5.3.2)(webpack@5.91.0):
     resolution: {integrity: sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -24899,10 +25361,10 @@ packages:
       semver: 7.5.4
       source-map: 0.7.4
       typescript: 5.3.2
-      webpack: 5.90.3(webpack-cli@5.1.4)
+      webpack: 5.91.0(webpack-cli@5.1.4)
     dev: true
 
-  /ts-loader@9.5.1(webpack@5.90.3):
+  /ts-loader@9.5.1(webpack@5.91.0):
     resolution: {integrity: sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -24914,7 +25376,7 @@ packages:
       micromatch: 4.0.5
       semver: 7.5.4
       source-map: 0.7.4
-      webpack: 5.90.3(esbuild@0.20.1)
+      webpack: 5.91.0(esbuild@0.20.2)
     dev: true
 
   /ts-morph@4.3.3:
@@ -25422,7 +25884,7 @@ packages:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
     engines: {node: '>= 10.0.0'}
 
-  /unocss@0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.35)(vite@4.5.3):
+  /unocss@0.58.9(@unocss/webpack@0.58.9)(postcss@8.4.38)(vite@4.5.3):
     resolution: {integrity: sha512-aqANXXP0RrtN4kSaTLn/7I6wh8o45LUdVgPzGu7Fan2DfH2+wpIs6frlnlHlOymnb+52dp6kXluQinddaUKW1A==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -25438,7 +25900,7 @@ packages:
       '@unocss/cli': 0.58.9
       '@unocss/core': 0.58.9
       '@unocss/extractor-arbitrary-variants': 0.58.9
-      '@unocss/postcss': 0.58.9(postcss@8.4.35)
+      '@unocss/postcss': 0.58.9(postcss@8.4.38)
       '@unocss/preset-attributify': 0.58.9
       '@unocss/preset-icons': 0.58.9
       '@unocss/preset-mini': 0.58.9
@@ -25454,7 +25916,7 @@ packages:
       '@unocss/transformer-directives': 0.58.9
       '@unocss/transformer-variant-group': 0.58.9
       '@unocss/vite': 0.58.9(vite@4.5.3)
-      '@unocss/webpack': 0.58.9(webpack@5.90.3)
+      '@unocss/webpack': 0.58.9(webpack@5.91.0)
       vite: 4.5.3(sass@1.71.1)
     transitivePeerDependencies:
       - postcss
@@ -25636,7 +26098,7 @@ packages:
       chokidar: 3.6.0
       destr: 2.0.3
       h3: 1.10.1
-      ioredis: 5.3.2
+      ioredis: 5.4.1
       listhen: 1.6.0
       lru-cache: 10.0.3
       mri: 1.2.0
@@ -26089,7 +26551,7 @@ packages:
         optional: true
     dependencies:
       esbuild: 0.18.20
-      postcss: 8.4.35
+      postcss: 8.4.38
       rollup: 3.29.4
       sass: 1.71.1
     optionalDependencies:
@@ -26513,6 +26975,14 @@ packages:
       graceful-fs: 4.2.11
     dev: true
 
+  /watchpack@2.4.1:
+    resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+    dev: true
+
   /wcwidth@1.0.1:
     resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
     dependencies:
@@ -26542,7 +27012,7 @@ packages:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
 
-  /webpack-cli@5.1.4(webpack@5.90.3):
+  /webpack-cli@5.1.4(webpack@5.91.0):
     resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==}
     engines: {node: '>=14.15.0'}
     hasBin: true
@@ -26560,9 +27030,9 @@ packages:
         optional: true
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.90.3)
-      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.90.3)
-      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack@5.90.3)
+      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.91.0)
+      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.91.0)
+      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack@5.91.0)
       colorette: 2.0.20
       commander: 10.0.1
       cross-spawn: 7.0.3
@@ -26571,7 +27041,7 @@ packages:
       import-local: 3.1.0
       interpret: 3.1.1
       rechoir: 0.8.0
-      webpack: 5.90.3(webpack-cli@5.1.4)
+      webpack: 5.91.0(webpack-cli@5.1.4)
       webpack-merge: 5.9.0
     dev: true
 
@@ -26632,7 +27102,7 @@ packages:
       tapable: 2.2.1
       terser-webpack-plugin: 5.3.10(webpack@5.90.1)
       watchpack: 2.4.0
-      webpack-cli: 5.1.4(webpack@5.90.3)
+      webpack-cli: 5.1.4(webpack@5.91.0)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
@@ -26640,8 +27110,8 @@ packages:
       - uglify-js
     dev: true
 
-  /webpack@5.90.3(esbuild@0.20.1):
-    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+  /webpack@5.91.0(esbuild@0.20.2):
+    resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
@@ -26652,15 +27122,15 @@ packages:
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.5
-      '@webassemblyjs/ast': 1.11.6
-      '@webassemblyjs/wasm-edit': 1.11.6
-      '@webassemblyjs/wasm-parser': 1.11.6
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/wasm-edit': 1.12.1
+      '@webassemblyjs/wasm-parser': 1.12.1
       acorn: 8.11.3
       acorn-import-assertions: 1.9.0(acorn@8.11.3)
       browserslist: 4.23.0
       chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.15.1
-      es-module-lexer: 1.4.1
+      enhanced-resolve: 5.16.0
+      es-module-lexer: 1.5.2
       eslint-scope: 5.1.1
       events: 3.3.0
       glob-to-regexp: 0.4.1
@@ -26671,8 +27141,8 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(esbuild@0.20.1)(webpack@5.90.3)
-      watchpack: 2.4.0
+      terser-webpack-plugin: 5.3.10(esbuild@0.20.2)(webpack@5.91.0)
+      watchpack: 2.4.1
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
@@ -26680,8 +27150,8 @@ packages:
       - uglify-js
     dev: true
 
-  /webpack@5.90.3(webpack-cli@5.1.4):
-    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+  /webpack@5.91.0(webpack-cli@5.1.4):
+    resolution: {integrity: sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
@@ -26692,15 +27162,15 @@ packages:
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.5
-      '@webassemblyjs/ast': 1.11.6
-      '@webassemblyjs/wasm-edit': 1.11.6
-      '@webassemblyjs/wasm-parser': 1.11.6
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/wasm-edit': 1.12.1
+      '@webassemblyjs/wasm-parser': 1.12.1
       acorn: 8.11.3
       acorn-import-assertions: 1.9.0(acorn@8.11.3)
       browserslist: 4.23.0
       chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.15.1
-      es-module-lexer: 1.4.1
+      enhanced-resolve: 5.16.0
+      es-module-lexer: 1.5.2
       eslint-scope: 5.1.1
       events: 3.3.0
       glob-to-regexp: 0.4.1
@@ -26711,9 +27181,9 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(webpack@5.90.3)
-      watchpack: 2.4.0
-      webpack-cli: 5.1.4(webpack@5.90.3)
+      terser-webpack-plugin: 5.3.10(webpack@5.91.0)
+      watchpack: 2.4.1
+      webpack-cli: 5.1.4(webpack@5.91.0)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
@@ -26946,7 +27416,7 @@ packages:
     dependencies:
       '@colors/colors': 1.5.0
       '@dabh/diagnostics': 2.0.3
-      async: 3.2.4
+      async: 3.2.5
       is-stream: 2.0.1
       logform: 2.5.1
       one-time: 1.0.0
diff --git a/tests/playwright/pages/Account/Authentication.ts b/tests/playwright/pages/Account/Authentication.ts
index 498ffa1775..45b634e5b8 100644
--- a/tests/playwright/pages/Account/Authentication.ts
+++ b/tests/playwright/pages/Account/Authentication.ts
@@ -15,7 +15,7 @@ export class AccountAuthenticationPage extends BasePage {
     await this.waitForResponse({
       uiAction: () => this.rootPage.goto('/#/account/authentication', { waitUntil: 'networkidle' }),
       httpMethodsToMatch: ['GET'],
-      requestUrlPathToMatch: '/api/v2/sso-client',
+      requestUrlPathToMatch: /\/sso-client/,
     });
   }
 
@@ -42,7 +42,7 @@ export class AccountAuthenticationPage extends BasePage {
     await this.waitForResponse({
       uiAction: () => this.rootPage.locator(`[data-test-id="nc-${provider}-delete"]`).click(),
       httpMethodsToMatch: ['DELETE'],
-      requestUrlPathToMatch: `/api/v2/sso-client/`,
+      requestUrlPathToMatch: /\/sso-client/,
     });
   }
 
@@ -50,7 +50,7 @@ export class AccountAuthenticationPage extends BasePage {
     await this.waitForResponse({
       uiAction: () => this.get().locator(`.nc-${provider}-${title}-enable .nc-switch`).click(),
       httpMethodsToMatch: ['PATCH'],
-      requestUrlPathToMatch: `/api/v2/sso-client/`,
+      requestUrlPathToMatch: /\/\w+\/sso-client/,
     });
   }
 
@@ -97,7 +97,7 @@ export class AccountAuthenticationPage extends BasePage {
     await this.waitForResponse({
       uiAction: () => samlModal.locator('[data-test-id="nc-saml-submit"]').click(),
       httpMethodsToMatch: ['GET'],
-      requestUrlPathToMatch: '/api/v2/sso-client',
+      requestUrlPathToMatch: /\/sso-client/,
     });
   }
 
@@ -158,7 +158,7 @@ export class AccountAuthenticationPage extends BasePage {
     await this.waitForResponse({
       uiAction: () => oidcModal.locator('[data-test-id="nc-oidc-save-btn"]').click(),
       httpMethodsToMatch: ['GET'],
-      requestUrlPathToMatch: '/api/v2/sso-client',
+      requestUrlPathToMatch: /\/sso-client/,
     });
   }
 
@@ -177,7 +177,7 @@ export class AccountAuthenticationPage extends BasePage {
     await this.waitForResponse({
       uiAction: () => googleModal.locator('[data-test-id="nc-google-save-btn"]').click(),
       httpMethodsToMatch: ['GET'],
-      requestUrlPathToMatch: '/api/v2/sso-client',
+      requestUrlPathToMatch: /\/sso-client/,
     });
   }
 
diff --git a/tests/playwright/pages/Base.ts b/tests/playwright/pages/Base.ts
index a93a00cfa8..7773015669 100644
--- a/tests/playwright/pages/Base.ts
+++ b/tests/playwright/pages/Base.ts
@@ -31,7 +31,7 @@ export default abstract class BasePage {
     responseStatusCodeToMatch = 200,
   }: {
     uiAction: () => Promise<any>;
-    requestUrlPathToMatch: string;
+    requestUrlPathToMatch: string | RegExp;
     httpMethodsToMatch?: string[];
     responseJsonMatcher?: ResponseSelector;
     timeout?: number;
@@ -40,7 +40,9 @@ export default abstract class BasePage {
     const [res] = await Promise.all([
       this.rootPage.waitForResponse(
         res =>
-          res.url().includes(requestUrlPathToMatch) &&
+          (requestUrlPathToMatch instanceof RegExp
+            ? requestUrlPathToMatch.test(res.url())
+            : res.url().includes(requestUrlPathToMatch)) &&
           res.status() === responseStatusCodeToMatch &&
           httpMethodsToMatch.includes(res.request().method()),
         timeout ? { timeout } : undefined
diff --git a/tests/playwright/pages/Dashboard/BulkUpdate/index.ts b/tests/playwright/pages/Dashboard/BulkUpdate/index.ts
index f48865a894..4eb7b3e48e 100644
--- a/tests/playwright/pages/Dashboard/BulkUpdate/index.ts
+++ b/tests/playwright/pages/Dashboard/BulkUpdate/index.ts
@@ -183,7 +183,7 @@ export class BulkUpdatePage extends BasePage {
         uiAction: saveRowAction,
         requestUrlPathToMatch: 'api/v1/db/data/noco/',
         httpMethodsToMatch: ['GET'],
-        responseJsonMatcher: json => json['pageInfo'],
+        // responseJsonMatcher: json => json['pageInfo'],
       });
     }
 
diff --git a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
index 8ad6d110a1..5b3758b5fa 100644
--- a/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
+++ b/tests/playwright/pages/Dashboard/ExpandedForm/index.ts
@@ -84,7 +84,7 @@ export class ExpandedFormPage extends BasePage {
       case 'belongsTo':
         await field.locator('.nc-virtual-cell').hover();
         await field.locator('.nc-action-icon').click();
-        await this.dashboard.linkRecord.select(value);
+        await this.dashboard.linkRecord.select(value, false);
         break;
       case 'hasMany':
       case 'manyToMany':
@@ -127,8 +127,11 @@ export class ExpandedFormPage extends BasePage {
 
     await this.verifyToast({ message: `updated successfully.` });
     await this.rootPage.locator('[data-testid="grid-load-spinner"]').waitFor({ state: 'hidden' });
+
     // removing focus from toast
+    await this.rootPage.waitForTimeout(1000);
     await this.rootPage.locator('.nc-modal').click();
+    await this.rootPage.waitForTimeout(1000);
     await this.get().locator('.nc-expanded-form-header').locator('.nc-expand-form-close-btn').click();
     await this.get().waitFor({ state: 'hidden' });
   }
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts
index 012de5a532..7de4f16eb7 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/ChildList.ts
@@ -22,7 +22,7 @@ export class ChildList extends BasePage {
 
     // child list body validation (card count, card title)
     const cardCount = cardTitle.length;
-    await this.get().locator('.ant-modal-content').waitFor();
+    await this.get().locator('.nc-dropdown-link-record-header').waitFor();
     {
       let isOk = false;
       let count = 0;
@@ -54,7 +54,8 @@ export class ChildList extends BasePage {
   }
 
   async close() {
-    await this.get().locator(`.nc-close-btn`).click();
+    // await this.get().locator(`.nc-close-btn`).click();
+    await this.rootPage.keyboard.press('Escape');
     await this.get().waitFor({ state: 'hidden' });
   }
 
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts
index 352b786063..4c31ae4eab 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/LTAR/LinkRecord.ts
@@ -33,14 +33,22 @@ export class LinkRecord extends BasePage {
     }
   }
 
-  async select(cardTitle: string) {
+  async select(cardTitle: string, close = true) {
     await this.rootPage.waitForTimeout(100);
-    await this.get().locator(`.ant-card:has-text("${cardTitle}"):visible`).click();
-    await this.close();
+    await this.get()
+      .locator(`.ant-card:has-text("${cardTitle}"):visible`)
+      .locator('button.nc-list-item-link-unlink-btn')
+      .click();
+
+    // explicitly close dropdown (auto closes for belongs to)
+    if (close) {
+      await this.close();
+    }
   }
 
   async close() {
-    await this.get().locator('.nc-close-btn').last().click();
+    await this.get().getByTestId('nc-link-count-info').click();
+    await this.rootPage.keyboard.press('Escape');
     await this.get().last().waitFor({ state: 'hidden' });
   }
 
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 42811b0975..da7fe10b91 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -321,14 +321,26 @@ export class ColumnPageObject extends BasePage {
         // Date Format
         await this.get().locator('.nc-date-select').click();
         await this.rootPage.locator('.ant-select-item').locator(`text="${dateFormat}"`).click();
+
+        // allow UI to update
+        await this.rootPage.waitForTimeout(500);
+
         // Time Format
         await this.get().locator('.nc-time-select').click();
         await this.rootPage.locator('.ant-select-item').locator(`text="${timeFormat}"`).click();
+
+        // allow UI to update
+        await this.rootPage.waitForTimeout(500);
+
         break;
       case 'Date':
         await this.get().locator('.nc-date-select').click();
-        await this.rootPage.locator('.nc-date-select').pressSequentially(dateFormat);
+        await this.rootPage.locator('.nc-date-select').pressSequentially(dateFormat, { delay: 100 });
         await this.rootPage.locator('.ant-select-item').locator(`text="${dateFormat}"`).click();
+
+        // allow UI to update
+        await this.rootPage.waitForTimeout(500);
+
         break;
       default:
         break;
diff --git a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
index 1e0ae1f59b..7a0b29a203 100644
--- a/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
+++ b/tests/playwright/pages/Dashboard/ProjectView/AccessSettingsPage.ts
@@ -19,7 +19,7 @@ export class AccessSettingsPage extends BasePage {
 
     for (let i = 0; i < userCount; i++) {
       const user = this.get().locator('.user-row').nth(i);
-      const userEmail = (await user.locator('.users-email-grid').innerText()).split('\n')[1];
+      const userEmail = (await user.locator('.users-email-grid').innerText()).split('\n').pop();
 
       if (userEmail === email) {
         const roleDropdown = user.locator('.nc-roles-selector');
diff --git a/tests/playwright/pages/Dashboard/TreeView.ts b/tests/playwright/pages/Dashboard/TreeView.ts
index 4f87867e5e..cc226a0537 100644
--- a/tests/playwright/pages/Dashboard/TreeView.ts
+++ b/tests/playwright/pages/Dashboard/TreeView.ts
@@ -111,26 +111,24 @@ export class TreeViewPage extends BasePage {
     }
 
     await this.get().getByTestId(`nc-tbl-title-${title}`).waitFor({ state: 'visible' });
-
     if (networkResponse === true) {
       await this.waitForResponse({
-        uiAction: () =>
-          this.get()
-            .getByTestId(`nc-tbl-title-${title}`)
-            .click({
-              position: {
-                x: 10,
-                y: 10,
-              },
-            }),
+        uiAction: () => this.get().getByTestId(`nc-tbl-title-${title}`).closest('.nc-base-tree-tbl').click(),
         httpMethodsToMatch: ['GET'],
         requestUrlPathToMatch: `/api/v1/db/data/noco`,
         responseJsonMatcher: json => json.pageInfo,
       });
       await this.dashboard.waitForTabRender({ title, mode });
     } else {
-      await this.get().getByTestId(`nc-tbl-title-${title}`).click();
+      await this.get().locator(`[data-testid="nc-tbl-title-${title}"]`).click({
+        // x:10, y:10
+      });
+
+      // todo: remove this after fixing the issue
       await this.rootPage.waitForTimeout(1000);
+      await this.get().locator(`[data-testid="nc-tbl-title-${title}"]`).click({
+        // x:10, y:10
+      });
     }
   }
 
diff --git a/tests/playwright/pages/Dashboard/common/Cell/index.ts b/tests/playwright/pages/Dashboard/common/Cell/index.ts
index 24495b8a8b..7244a28c65 100644
--- a/tests/playwright/pages/Dashboard/common/Cell/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Cell/index.ts
@@ -347,7 +347,9 @@ export class CellPageObject extends BasePage {
         await expect.poll(() => this.rootPage.locator('.ant-card:visible').count()).toBe(count);
 
         // close child list
-        await this.rootPage.locator('.nc-modal-child-list').locator('.nc-close-btn').last().click();
+        // await this.rootPage.locator('.nc-modal-child-list').locator('.nc-close-btn').last().click();
+        await this.rootPage.locator('.nc-modal-child-list').getByTestId('nc-link-count-info').click();
+        await this.rootPage.keyboard.press('Escape');
       }
     }
   }
@@ -373,12 +375,17 @@ export class CellPageObject extends BasePage {
 
       await this.waitForResponse({
         uiAction: () =>
-          this.rootPage.locator(`[data-testid="nc-child-list-item"]`).last().click({ force: true, timeout: 3000 }),
+          this.rootPage
+            .locator(`[data-testid="nc-child-list-item"]`)
+            .last()
+            .locator('button.nc-list-item-link-unlink-btn')
+            .click({ force: true, timeout: 3000 }),
         requestUrlPathToMatch: '/api/v1/db/data/noco',
         httpMethodsToMatch: ['GET'],
       });
 
       await this.rootPage.keyboard.press('Escape');
+      await this.rootPage.keyboard.press('Escape');
     }
   }
 
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
index 8670da0a08..a39431fa92 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Filter.ts
@@ -131,7 +131,7 @@ export class ToolbarFilterPage extends BasePage {
     skipWaitingResponse = true;
 
     const selectedField = await getTextExcludeIconText(
-      this.rootPage.locator('.nc-filter-field-select .ant-select-selection-item')
+      this.rootPage.locator('.nc-filter-field-select .ant-select-selection-item').first()
     );
     if (selectedField !== title) {
       await this.rootPage.locator('.nc-filter-field-select').last().click();
@@ -332,7 +332,7 @@ export class ToolbarFilterPage extends BasePage {
                 .locator(`.nc-dropdown-user-select-cell`)
                 .getByTestId('select-option-User-filter')
                 .getByText(v[i])
-                .click();
+                .click({ force: true });
             }
           }
           break;
diff --git a/tests/playwright/pages/OrgAdmin/Bases.ts b/tests/playwright/pages/OrgAdmin/Bases.ts
new file mode 100644
index 0000000000..fbd4935629
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Bases.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Bases extends BasePage {
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  get() {
+    return this.rootPage.locator('[data-test-id="nc-admin-bases"]');
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Dashboard.ts b/tests/playwright/pages/OrgAdmin/Dashboard.ts
new file mode 100644
index 0000000000..aab3ba593b
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Dashboard.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Dashboard extends BasePage {
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  get() {
+    return this.rootPage.locator('[data-test-id="nc-admin-dashboard"]');
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Domain.ts b/tests/playwright/pages/OrgAdmin/Domain.ts
new file mode 100644
index 0000000000..eca01b0f51
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Domain.ts
@@ -0,0 +1,51 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Domain extends BasePage {
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  get() {
+    return this.rootPage.locator('[data-test-id="nc-org-domain"]');
+  }
+
+  async addDomain(domainName: string) {
+    await this.get().locator('[data-test-id="nc-org-domain-add"]').click();
+    await this.rootPage.locator('[data-test-id="nc-org-domain-name"]').fill(domainName);
+
+    await this.waitForResponse({
+      uiAction: () => this.rootPage.locator('[data-test-id="nc-org-domain-submit"]').click(),
+      httpMethodsToMatch: ['PATCH', 'POST'],
+      requestUrlPathToMatch: /api\/v2\/domains\/\w+/,
+    });
+  }
+
+  async openOptionMenu(domainName: string) {
+    await this.rootPage
+      .locator(`[data-test-id="nc-domain-${domainName}"]`)
+      .locator('[data-test-id="nc-domain-more-option"]')
+      .click();
+  }
+
+  async verifyDomain(domainName: string) {
+    await this.openOptionMenu(domainName);
+    await this.waitForResponse({
+      uiAction: () => this.rootPage.locator('[data-test-id="nc-domain-verify"]').click(),
+      httpMethodsToMatch: ['POST'],
+      requestUrlPathToMatch: `/api/v2/org-domain/${domainName}`,
+    });
+  }
+
+  async deleteDomain(domainName: string) {
+    await this.openOptionMenu(domainName);
+    await this.waitForResponse({
+      uiAction: () => this.rootPage.locator('[data-test-id="nc-domain-delete"]').click(),
+      httpMethodsToMatch: ['DELETE'],
+      requestUrlPathToMatch: `/api/v2/org-domain/${domainName}`,
+    });
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Members.ts b/tests/playwright/pages/OrgAdmin/Members.ts
new file mode 100644
index 0000000000..ff922d782f
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Members.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Members extends BasePage {
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  get() {
+    return this.rootPage.locator('[data-test-id="nc-admin-members"]');
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts b/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts
new file mode 100644
index 0000000000..59e19bff2d
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/OpenIDLoginPage.ts
@@ -0,0 +1,46 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { CloudSSOLoginPage } from './SSOLoginPage';
+
+export class CloudOpenIDLoginPage extends BasePage {
+  readonly projectsPage: ProjectsPage;
+  readonly ssoLoginPage: CloudSSOLoginPage;
+
+  constructor(rootPage: Page) {
+    super(rootPage);
+    this.projectsPage = new ProjectsPage(rootPage);
+    this.ssoLoginPage = new CloudSSOLoginPage(rootPage);
+  }
+
+  async goto(_title = 'test', email: string) {
+    await this.ssoLoginPage.goto(email);
+    await this.ssoLoginPage.signIn({ email });
+    // // reload page to get latest app info
+    // await this.rootPage.reload({ waitUntil: 'networkidle' });
+    // // click sign in with SAML
+    // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+  }
+
+  get() {
+    return this.rootPage.locator('html');
+  }
+
+  async signIn({ email }: { email: string }) {
+    const signIn = this.get();
+    await signIn.locator('[name="login"]').waitFor();
+
+    await signIn.locator(`[name="login"]`).fill(email);
+    await signIn.locator(`[name="password"]`).fill('dummy-password');
+
+    await signIn.locator(`[type="submit"]`).click();
+    const authorize = this.get();
+
+    await Promise.all([
+      this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+      authorize.locator(`[type="submit"]`).click(),
+    ]);
+
+    await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts b/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts
new file mode 100644
index 0000000000..562bb2ab54
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SAMLLoginPage.ts
@@ -0,0 +1,42 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { CloudSSOLoginPage } from './SSOLoginPage';
+
+export class CloudSAMLLoginPage extends BasePage {
+  readonly projectsPage: ProjectsPage;
+  readonly ssoLoginPage: CloudSSOLoginPage;
+
+  constructor(rootPage: Page) {
+    super(rootPage);
+    this.projectsPage = new ProjectsPage(rootPage);
+    this.ssoLoginPage = new CloudSSOLoginPage(rootPage);
+  }
+
+  async goto(_title = 'test', email: string) {
+    await this.ssoLoginPage.goto(email);
+    await this.ssoLoginPage.signIn({ email });
+    // // reload page to get latest app info
+    // await this.rootPage.reload({ waitUntil: 'networkidle' });
+    // // click sign in with SAML
+    // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+  }
+
+  get() {
+    return this.rootPage.locator('html');
+  }
+
+  async signIn({ email }: { email: string }) {
+    const signIn = this.get();
+    await signIn.locator('#userName').waitFor();
+
+    await signIn.locator(`#userName`).fill(email);
+    await signIn.locator(`#email`).fill(email);
+    await Promise.all([
+      this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+      signIn.locator(`#btn-sign-in`).click(),
+    ]);
+
+    await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SSO.ts b/tests/playwright/pages/OrgAdmin/SSO.ts
new file mode 100644
index 0000000000..be2756b3dd
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SSO.ts
@@ -0,0 +1,200 @@
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+import { expect } from '@playwright/test';
+import { Domain } from './Domain';
+import { OrgAdminPage } from './index';
+
+export class CloudSSO extends BasePage {
+  readonly projectsPage: ProjectsPage;
+  readonly domain: Domain;
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.domain = new Domain(orgAdminPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  async goto() {
+    // wait for 2 seconds to make sure the page is loaded
+    // await this.rootPage.waitForTimeout(2000);
+    // console.log(await this.rootPage.locator('[data-test-id="nc-org-sso-settings"]').count());
+    await this.waitForResponse({
+      uiAction: () => this.rootPage.locator('[data-test-id="nc-org-sso-settings"]').click(),
+      httpMethodsToMatch: ['GET'],
+      requestUrlPathToMatch: '/api/v2/orgs/',
+    });
+  }
+
+  get() {
+    return this.rootPage.locator('html');
+  }
+
+  async verifySAMLProviderCount({ count }: { count: number }) {
+    await expect.poll(async () => await this.get().locator('.nc-saml-provider').count()).toBe(count);
+  }
+
+  async verifyOIDCProviderCount({ count }: { count: number }) {
+    await expect.poll(async () => await this.get().locator('.nc-oidc-provider').count()).toBe(count);
+  }
+  async deleteExistingClientIfAny(provider: 'saml' | 'oidc' | 'google', title: string) {
+    if (
+      !(await this.rootPage
+        .locator(provider === 'google' ? '.nc-google-more-option' : `.nc-${provider}-${title}-more-option`)
+        .count())
+    )
+      return;
+
+    await this.deleteProvider(provider, title);
+  }
+
+  async getProvider(provider: 'saml' | 'oidc', title: string) {
+    return this.rootPage.locator(`[data-test-id="nc-${provider}-provider-${title}"]`);
+  }
+
+  async deleteProvider(provider: 'saml' | 'oidc' | 'google', title: string) {
+    await this.rootPage
+      .locator(provider === 'google' ? '.nc-google-more-option' : `.nc-${provider}-${title}-more-option`)
+      .click();
+    await this.waitForResponse({
+      uiAction: () => this.rootPage.locator(`[data-test-id="nc-${provider}-delete"]`).click(),
+      httpMethodsToMatch: ['DELETE'],
+      requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-client/,
+    });
+  }
+
+  async toggleProvider(provider: 'saml' | 'oidc' | 'google', title: string) {
+    await this.waitForResponse({
+      uiAction: () => this.get().locator(`.nc-${provider}-${title}-enable .nc-switch`).click(),
+      httpMethodsToMatch: ['PATCH'],
+      requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-client/,
+    });
+  }
+
+  async selectScope({ type }: { type: string[] }) {
+    await this.rootPage.locator('.ant-select-selector').click();
+
+    await this.rootPage.locator('.ant-select-selection-search-input[aria-expanded="true"]').waitFor();
+    for (const t of type) {
+      await this.rootPage.locator('.rc-virtual-list-holder-inner > div').locator(`text="${t}"`).click();
+    }
+  }
+
+  async createSAMLProvider(
+    p: { title: string; url?: string; xml?: string },
+    setupRedirectUrlCbk?: (params: { redirectUrl: string; audience: string }) => Promise<void>
+  ) {
+    const newSamlBtn = this.get().locator('[data-test-id="nc-new-saml-provider"]');
+
+    await newSamlBtn.click();
+
+    const samlModal = this.rootPage.locator('.nc-saml-modal');
+
+    // wait until redirect url is generated
+    await samlModal.locator('[data-test-id="nc-saml-redirect-url"]:has-text("http://")').waitFor();
+
+    if (setupRedirectUrlCbk) {
+      const redirectUrl = (
+        await samlModal.locator('[data-test-id="nc-saml-redirect-url"]:has-text("http://")').textContent()
+      ).trim();
+      const audience = (
+        await samlModal.locator('[data-test-id="nc-saml-issuer-url"]:has-text("http://")').textContent()
+      ).trim();
+      await setupRedirectUrlCbk({ redirectUrl, audience });
+    }
+
+    await samlModal.locator('[data-test-id="nc-saml-title"]').fill(p.title);
+    if (p.url) {
+      await samlModal.locator('[data-test-id="nc-saml-metadata-url"]').fill(p.url);
+    }
+    if (p.xml) {
+      await samlModal.locator('[data-test-id="nc-saml-xml"]').fill(p.xml);
+    }
+
+    await this.waitForResponse({
+      uiAction: () => samlModal.locator('[data-test-id="nc-saml-submit"]').click(),
+      httpMethodsToMatch: ['GET'],
+      requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+    });
+  }
+
+  async createOIDCProvider(
+    p: {
+      issuer: string;
+      title: string;
+      clientId: string;
+      clientSecret: string;
+      authUrl: string;
+      userInfoUrl: string;
+      tokenUrl: string;
+      jwkUrl: string;
+      scopes: Array<string>;
+      userAttributes: string;
+    },
+    setupRedirectUrlCbk?: (params: { redirectUrl: string }) => Promise<void>
+  ) {
+    const newOIDCBtn = this.get().locator('[data-test-id="nc-new-oidc-provider"]');
+
+    await newOIDCBtn.click();
+
+    const oidcModal = this.rootPage.locator('.nc-oidc-modal');
+
+    // wait until redirect url is generated
+    await oidcModal.locator('[data-test-id="nc-openid-redirect-url"]:has-text("http://")').waitFor();
+
+    if (setupRedirectUrlCbk) {
+      const redirectUrl = (
+        await oidcModal.locator('[data-test-id="nc-openid-redirect-url"]:has-text("http://")').textContent()
+      ).trim();
+      await setupRedirectUrlCbk({ redirectUrl });
+    }
+
+    await oidcModal.locator('[data-test-id="nc-oidc-title"]').fill(p.title);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-issuer"]').fill(p.issuer);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-client-id"]').fill(p.clientId);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-client-secret"]').fill(p.clientSecret);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-auth-url"]').fill(p.authUrl);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-token-url"]').fill(p.tokenUrl);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-user-info-url"]').fill(p.userInfoUrl);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-jwk-url"]').fill(p.jwkUrl);
+
+    await this.selectScope({
+      type: p.scopes,
+      locator: oidcModal.locator('[data-test-id="nc-oidc-scope"]'),
+    } as any);
+
+    await oidcModal.locator('[data-test-id="nc-oidc-user-attribute"]').fill(p.userAttributes);
+
+    await this.waitForResponse({
+      uiAction: () => oidcModal.locator('[data-test-id="nc-oidc-save-btn"]').click(),
+      httpMethodsToMatch: ['GET'],
+      requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+    });
+  }
+
+  async createGoogleProvider(p: { clientId: string; clientSecret: string }) {
+    await this.rootPage.locator(`.nc-google-more-option`).click();
+    await this.rootPage.locator(`[data-test-id="nc-google-edit"]`).click();
+
+    const googleModal = this.rootPage.locator('.nc-google-modal');
+    // wait until redirect url is generated
+    await googleModal.locator('[data-test-id="nc-google-redirect-url"]:has-text("http://")').waitFor();
+
+    await googleModal.locator('[data-test-id="nc-google-client-id"]').fill(p.clientId);
+
+    await googleModal.locator('[data-test-id="nc-google-client-secret"]').fill(p.clientSecret);
+
+    await this.waitForResponse({
+      uiAction: () => googleModal.locator('[data-test-id="nc-google-save-btn"]').click(),
+      httpMethodsToMatch: ['GET'],
+      requestUrlPathToMatch: /\/api\/v2\/orgs\/\w+\/sso-clients/,
+    });
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts b/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts
new file mode 100644
index 0000000000..299600be10
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/SSOLoginPage.ts
@@ -0,0 +1,37 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { ProjectsPage } from '../ProjectsPage';
+
+export class CloudSSOLoginPage extends BasePage {
+  readonly projectsPage: ProjectsPage;
+
+  constructor(rootPage: Page) {
+    super(rootPage);
+    this.projectsPage = new ProjectsPage(rootPage);
+  }
+
+  async goto(_email: string) {
+    // reload page to get latest app info
+    await this.rootPage.goto('/#/sso');
+    // click sign in with SAML
+    // await this.rootPage.locator(`button:has-text("Sign in with ${title}")`).click();
+  }
+
+  get() {
+    return this.rootPage.locator('html');
+  }
+
+  async signIn({ email }: { email: string }) {
+    const signIn = this.get();
+    await signIn.locator('[data-testid="nc-form-org-sso-signin__email"]').waitFor();
+
+    await signIn.locator('[data-testid="nc-form-org-sso-signin__email"]').fill(email);
+
+    await Promise.all([
+      this.rootPage.waitForNavigation({ url: /localhost:3000/ }),
+      signIn.getByTestId('nc-form-signin__submit').click(),
+    ]);
+
+    await this.rootPage.locator(`[data-testid="nc-sidebar-userinfo"]:has-text("${email.split('@')[0]}")`);
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Settings.ts b/tests/playwright/pages/OrgAdmin/Settings.ts
new file mode 100644
index 0000000000..ef91daba92
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Settings.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Settings extends BasePage {
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  get() {
+    return this.rootPage.locator('[data-test-id="nc-admin-settings"]');
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/Workspaces.ts b/tests/playwright/pages/OrgAdmin/Workspaces.ts
new file mode 100644
index 0000000000..eebf8f6500
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/Workspaces.ts
@@ -0,0 +1,15 @@
+import BasePage from '../Base';
+import { OrgAdminPage } from './index';
+
+export class Workspaces extends BasePage {
+  readonly orgAdminPage: OrgAdminPage;
+
+  constructor(orgAdminPage: OrgAdminPage) {
+    super(orgAdminPage.rootPage);
+    this.orgAdminPage = orgAdminPage;
+  }
+
+  get() {
+    return this.rootPage.locator('[data-test-id="nc-admin-workspaces"]');
+  }
+}
diff --git a/tests/playwright/pages/OrgAdmin/index.ts b/tests/playwright/pages/OrgAdmin/index.ts
new file mode 100644
index 0000000000..1a48398bd1
--- /dev/null
+++ b/tests/playwright/pages/OrgAdmin/index.ts
@@ -0,0 +1,29 @@
+import { Page } from '@playwright/test';
+import BasePage from '../Base';
+import { CloudSSO } from './SSO';
+
+export class OrgAdminPage extends BasePage {
+  readonly ssoPage: CloudSSO;
+
+  constructor(page: Page) {
+    super(page);
+    this.ssoPage = new CloudSSO(this);
+  }
+
+  get() {
+    return this.rootPage.locator('body');
+  }
+  async goto() {
+    await this.rootPage.goto('/');
+    await this.rootPage.getByTestId('nc-sidebar-userinfo').click();
+
+    await this.rootPage.waitForTimeout(1000);
+
+    if ((await this.rootPage.getByTestId('nc-sidebar-upgrade-workspace-to-org').count()) > 0) {
+      await this.rootPage.getByTestId('nc-sidebar-upgrade-workspace-to-org').first().click();
+    } else {
+      await this.rootPage.getByTestId('nc-sidebar-org-admin-panel').click();
+    }
+    await this.rootPage.waitForNavigation({ url: /\/#\/admin\/\w+/ });
+  }
+}
diff --git a/tests/playwright/pages/SharedForm/index.ts b/tests/playwright/pages/SharedForm/index.ts
index fc3fe7115e..252beb1dc1 100644
--- a/tests/playwright/pages/SharedForm/index.ts
+++ b/tests/playwright/pages/SharedForm/index.ts
@@ -40,7 +40,8 @@ export class SharedFormPage extends BasePage {
   }
 
   async closeLinkToChildList() {
-    await this.get().locator('.nc-close-btn').click();
+    // await this.get().locator('.nc-close-btn').click();
+    await this.rootPage.keyboard.press('Escape');
   }
 
   async verifyChildList(cardTitle?: string[]) {
@@ -69,6 +70,9 @@ export class SharedFormPage extends BasePage {
   }
 
   async selectChildList(cardTitle: string) {
-    await this.get().locator(`.ant-card:has-text("${cardTitle}"):visible`).click();
+    await this.get()
+      .locator(`.ant-card:has-text("${cardTitle}"):visible`)
+      .locator('.nc-list-item-link-unlink-btn')
+      .click();
   }
 }
diff --git a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
index 49b90c03de..c7ece7c701 100644
--- a/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
+++ b/tests/playwright/pages/WorkspacePage/CollaborationPage.ts
@@ -9,17 +9,11 @@ import { Locator } from '@playwright/test';
 
 export class CollaborationPage extends BasePage {
   readonly workspace: WorkspacePage;
-  readonly button_addUser: Locator;
-  readonly input_email: Locator;
-  readonly selector_role: Locator;
   readonly list_collaborators: Locator;
 
   constructor(workspace: WorkspacePage) {
     super(workspace.rootPage);
     this.workspace = workspace;
-    this.button_addUser = this.get().locator('button.ant-btn.ant-btn-primary');
-    this.input_email = this.get().locator('input[id="email"]');
-    this.selector_role = this.get().locator('.ant-select-selector');
     this.list_collaborators = this.get().locator('.nc-collaborators-list-table');
   }
 
@@ -34,21 +28,34 @@ export class CollaborationPage extends BasePage {
   async addUsers(email: string, role: string) {
     await this.waitFor({ state: 'visible' });
 
+    // click add user button to open modal
+    await this.get().getByTestId('nc-add-member-btn').click();
+
+    const inviteModal = this.rootPage.locator('.nc-invite-dlg');
+
+    await inviteModal.waitFor({ state: 'visible' });
+
+    const input_email = inviteModal.locator('input[id="email"]');
+    const selector_role = inviteModal.locator('.ant-select-selector');
+    const button_addUser = inviteModal.locator('.nc-invite-btn');
+
+    // flaky test: wait for the input to be ready
+    await this.rootPage.waitForTimeout(500);
+
     // email
-    await this.input_email.fill(email);
-    await this.rootPage.keyboard.press('Enter');
+    await input_email.fill(email + ' ');
 
     // role
-    await this.selector_role.first().click();
-    const menu = this.rootPage.locator('.nc-role-select-dropdown:visible');
+    await selector_role.first().click();
+    const menu = this.rootPage.locator('.nc-role-selector-dropdown:visible');
     await menu.locator(`.nc-role-select-workspace-level-${role.toLowerCase()}:visible`).first().click();
 
     // submit
 
     // allow button to be enabled
     await this.rootPage.waitForTimeout(500);
-    await this.rootPage.keyboard.press('Enter');
-    await this.button_addUser.click();
+
+    await button_addUser.click();
     await this.verifyToast({ message: 'Invitation sent successfully' });
     await this.rootPage.waitForTimeout(500);
   }
diff --git a/tests/playwright/setup/index.ts b/tests/playwright/setup/index.ts
index f1dc5e7270..f67022df7b 100644
--- a/tests/playwright/setup/index.ts
+++ b/tests/playwright/setup/index.ts
@@ -155,6 +155,7 @@ export interface NcContext {
   workspace: WorkspaceType;
   defaultProjectTitle: string;
   defaultTableTitle: string;
+  api: Api<any>;
 }
 
 selectors.setTestIdAttribute('data-testid');
@@ -169,12 +170,14 @@ async function localInit({
   baseType = ProjectTypes.DATABASE,
   isSuperUser = false,
   dbType,
+  resetSsoClients = false,
 }: {
   workerId: string;
   isEmptyProject?: boolean;
   baseType?: ProjectTypes;
   isSuperUser?: boolean;
   dbType?: string;
+  resetSsoClients?: boolean;
 }) {
   const parallelId = process.env.TEST_PARALLEL_INDEX;
 
@@ -210,7 +213,7 @@ async function localInit({
     // console.log(process.env.TEST_WORKER_INDEX, process.env.TEST_PARALLEL_INDEX);
 
     // delete sso-clients
-    if (isEE() && api['ssoClient'] && isSuperUser) {
+    if (resetSsoClients && isEE() && api['ssoClient'] && isSuperUser) {
       const clients = await api.ssoClient.list();
       for (const client of clients.list) {
         try {
@@ -342,7 +345,7 @@ async function localInit({
 
     // get current user information
     const user = await api.auth.me();
-    return { data: { base, user, workspace, token }, status: 200 };
+    return { data: { base, user, workspace, token, api }, status: 200 };
   } catch (e) {
     console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e);
     return { data: {}, status: 500 };
@@ -355,12 +358,14 @@ const setup = async ({
   isEmptyProject = false,
   isSuperUser = false,
   url,
+  resetSsoClients = false,
 }: {
   baseType?: ProjectTypes;
   page: Page;
   isEmptyProject?: boolean;
   isSuperUser?: boolean;
   url?: string;
+  resetSsoClients?: boolean;
 }): Promise<NcContext> => {
   console.time('Setup');
 
@@ -384,6 +389,7 @@ const setup = async ({
       baseType,
       isSuperUser,
       dbType,
+      resetSsoClients,
     });
   } catch (e) {
     console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e);
@@ -472,6 +478,7 @@ const setup = async ({
     workspace,
     defaultProjectTitle: 'Getting Started',
     defaultTableTitle: 'Features',
+    api: response?.data?.api,
   } as NcContext;
 };
 
diff --git a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
index 9b932c6d26..69c867eed9 100644
--- a/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
+++ b/tests/playwright/tests/db/columns/columnLinkToAnotherRecord.spec.ts
@@ -59,8 +59,9 @@ test.describe('LTAR create & update', () => {
     // Verify fields and toggle the visibility
     await dashboard.grid.toolbar.clickFields();
     for (const title of ['Sheet1', 'Sheet1s']) {
-      await dashboard.grid.toolbar.fields.verify({ title, checked: false });
-      await dashboard.grid.toolbar.fields.click({ title, isLocallySaved: false });
+      // verify that fields are enabled
+      await dashboard.grid.toolbar.fields.verify({ title, checked: true });
+      // await dashboard.grid.toolbar.fields.click({ title, isLocallySaved: false });
     }
     await dashboard.grid.toolbar.clickFields();
 
@@ -90,7 +91,7 @@ test.describe('LTAR create & update', () => {
     // In cell insert
     await dashboard.grid.addNewRow({ index: 1, value: '2b' });
     await dashboard.grid.cell.inCellAdd({ index: 1, columnHeader: 'Sheet1' });
-    await dashboard.linkRecord.select('1b');
+    await dashboard.linkRecord.select('1b', false);
     await dashboard.grid.cell.inCellAdd({
       index: 1,
       columnHeader: 'Sheet1s',
@@ -157,8 +158,8 @@ test.describe('LTAR create & update', () => {
 
     // Verify fields and toggle the visibility
     await dashboard.grid.toolbar.clickFields();
-    await dashboard.grid.toolbar.fields.verify({ title: 'Sheet2', checked: false });
-    await dashboard.grid.toolbar.fields.click({ title: 'Sheet2', isLocallySaved: false });
+    await dashboard.grid.toolbar.fields.verify({ title: 'Sheet2', checked: true });
+    // await dashboard.grid.toolbar.fields.click({ title: 'Sheet2', isLocallySaved: false });
     await dashboard.grid.toolbar.clickFields();
 
     const expected2 = [
diff --git a/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
index e4fc5ba98e..1b81f11289 100644
--- a/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnMultiSelect.spec.ts
@@ -5,10 +5,18 @@ import setup, { unsetup } from '../../../setup';
 import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
 import { Api } from 'nocodb-sdk';
 let api: Api<any>;
+const addRecordUsingAPI = async (context: any, tableId: string, rowAttributes: any) => {
+  try {
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, rowAttributes);
+  } catch (e) {
+    console.error(e);
+  }
+};
 
 test.describe('Multi select', () => {
   let dashboard: DashboardPage, grid: GridPage;
   let context: any;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     context = await setup({ page, isEmptyProject: true });
@@ -22,7 +30,13 @@ test.describe('Multi select', () => {
       columnTitle: 'MultiSelect',
       options: ['Option 1', 'Option 2'],
     });
-    await grid.addNewRow({ index: 0, value: 'Row 0' });
+
+    api = context.api;
+
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+    await addRecordUsingAPI(context, tableId, [{ Id: 1, Title: `Row 0` }]);
+    await page.reload();
   });
 
   test.afterEach(async () => {
@@ -56,7 +70,14 @@ test.describe('Multi select', () => {
       multiSelect: true,
     });
 
-    await grid.addNewRow({ index: 1, value: 'Row 1' });
+    await addRecordUsingAPI(context, tableId, [
+      {
+        Id: 2,
+        Title: `Row 1`,
+      },
+    ]);
+    await grid.rootPage.reload();
+
     await grid.cell.selectOption.select({
       index: 1,
       columnHeader: 'MultiSelect',
diff --git a/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
index 74df46ddcc..97d098dcef 100644
--- a/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnSingleSelect.spec.ts
@@ -3,15 +3,19 @@ import { DashboardPage } from '../../../pages/Dashboard';
 import { GridPage } from '../../../pages/Dashboard/Grid';
 import setup, { unsetup } from '../../../setup';
 import { ToolbarPage } from '../../../pages/Dashboard/common/Toolbar';
+import { Api } from 'nocodb-sdk';
 
 test.describe('Single select', () => {
   let dashboard: DashboardPage, grid: GridPage;
   let context: any;
+  let api: Api<any>;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     context = await setup({ page, isEmptyProject: true });
     dashboard = new DashboardPage(page, context.base);
     grid = dashboard.grid;
+    api = context.api;
 
     await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
 
@@ -20,7 +24,11 @@ test.describe('Single select', () => {
       columnTitle: 'SingleSelect',
       options: ['Option 1', 'Option 2'],
     });
-    await grid.addNewRow({ index: 0, value: 'Row 0' });
+
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [{ Id: 1, Title: `Row 0` }]);
+    await page.reload();
   });
 
   test.afterEach(async () => {
@@ -120,12 +128,15 @@ test.describe('Single select - filter & sort', () => {
 
   let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
   let context: any;
+  let api: Api<any>;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     context = await setup({ page });
     dashboard = new DashboardPage(page, context.base);
     toolbar = dashboard.grid.toolbar;
     grid = dashboard.grid;
+    api = context.api;
 
     await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
 
@@ -134,10 +145,16 @@ test.describe('Single select - filter & sort', () => {
       columnTitle: 'SingleSelect',
       options: ['foo', 'bar', 'baz'],
     });
-    await grid.addNewRow({ index: 0, value: '1' });
-    await grid.addNewRow({ index: 1, value: '2' });
-    await grid.addNewRow({ index: 2, value: '3' });
-    await grid.addNewRow({ index: 3, value: '4' });
+
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 1, Title: '1' },
+      { Id: 2, Title: '2' },
+      { Id: 3, Title: '3' },
+      { Id: 4, Title: '4' },
+    ]);
+    await page.reload();
 
     await grid.cell.selectOption.select({ index: 1, columnHeader: 'SingleSelect', option: 'foo', multiSelect: false });
     await grid.cell.selectOption.select({ index: 2, columnHeader: 'SingleSelect', option: 'bar', multiSelect: false });
diff --git a/tests/playwright/tests/db/columns/columnUserSelect.spec.ts b/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
index 1dd6fc71d6..3af44e91c3 100644
--- a/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
+++ b/tests/playwright/tests/db/columns/columnUserSelect.spec.ts
@@ -25,22 +25,15 @@ const roleDb = [
 async function beforeEachInit({ page }: { page: any }) {
   let workspacePage: WorkspacePage;
   let collaborationPage: CollaborationPage;
-  let api: Api<any>;
 
   const context: any = await setup({ page, isEmptyProject: true });
   const dashboard: DashboardPage = new DashboardPage(page, context.base);
+  const api = context.api;
 
   if (isEE()) {
     workspacePage = new WorkspacePage(page);
     collaborationPage = workspacePage.collaboration;
 
-    api = new Api({
-      baseURL: `http://localhost:8080/`,
-      headers: {
-        'xc-auth': context.token,
-      },
-    });
-
     for (let i = 0; i < roleDb.length; i++) {
       try {
         await api.auth.signup({
@@ -59,25 +52,36 @@ async function beforeEachInit({ page }: { page: any }) {
     }
   }
 
-  return { dashboard, context };
+  return { dashboard, context, api };
 }
 
 test.describe('User single select', () => {
   let dashboard: DashboardPage, grid: GridPage, topbar: TopbarPage;
   let context: any;
+  let api: Api<any>;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     const initRsp = await beforeEachInit({ page: page });
     context = initRsp.context;
     dashboard = initRsp.dashboard;
+    api = initRsp.api;
     grid = dashboard.grid;
     topbar = dashboard.grid.topbar;
 
-    await dashboard.treeView.createTable({ title: 'Sheet1', baseTitle: context.base.title });
+    await dashboard.treeView.createTable({ title: 'sheet1', baseTitle: context.base.title });
 
     await grid.column.create({ title: 'User', type: 'User' });
 
-    await grid.addNewRow({ index: 0, value: 'Row 0' });
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      {
+        Id: 1,
+        Title: `Row 0`,
+      },
+    ]);
+    await page.reload();
   });
 
   test.afterEach(async () => {
@@ -102,7 +106,14 @@ test.describe('User single select', () => {
     });
 
     // Add new row and verify default value is added in new cell
-    await grid.addNewRow({ index: 1, value: 'Row 1' });
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      {
+        Id: 2,
+        Title: `Row 1`,
+      },
+    ]);
+    await grid.rootPage.reload();
+
     await grid.cell.userOption.verify({
       index: 1,
       columnHeader: 'User',
@@ -130,9 +141,17 @@ test.describe('User single select', () => {
   });
 
   test('Field operations - duplicate column, convert to SingleLineText', async () => {
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 2, Title: `Row 1` },
+      { Id: 3, Title: `Row 2` },
+      { Id: 4, Title: `Row 3` },
+      { Id: 5, Title: `Row 4` },
+      { Id: 6, Title: `Row 5` },
+    ]);
+    await grid.rootPage.reload();
+
     for (let i = 0; i <= 4; i++) {
       await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
-      await grid.addNewRow({ index: i + 1, value: `Row ${i + 1}` });
     }
 
     await grid.column.duplicateColumn({
@@ -164,10 +183,19 @@ test.describe('User single select', () => {
       multiSelect: false,
     });
 
+    // add 5 rows
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 2, Title: `Row 1` },
+      { Id: 3, Title: `Row 2` },
+      { Id: 4, Title: `Row 3` },
+      { Id: 5, Title: `Row 4` },
+      { Id: 6, Title: `Row 5` },
+    ]);
+    await grid.rootPage.reload();
+
     // Edit, refresh and verify
     for (let i = 0; i <= 4; i++) {
       await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
-      await grid.addNewRow({ index: i + 1, value: `Row ${i + 1}` });
     }
 
     // refresh page
@@ -275,11 +303,14 @@ test.describe('User single select - filter, sort & GroupBy', () => {
 
   let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
   let context: any;
+  let api: Api<any>;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     const initRsp = await beforeEachInit({ page: page });
     context = initRsp.context;
     dashboard = initRsp.dashboard;
+    api = initRsp.api;
     grid = dashboard.grid;
     toolbar = dashboard.grid.toolbar;
 
@@ -287,8 +318,18 @@ test.describe('User single select - filter, sort & GroupBy', () => {
 
     await grid.column.create({ title: 'User', type: 'User' });
 
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 1, Title: `0` },
+      { Id: 2, Title: `1` },
+      { Id: 3, Title: `2` },
+      { Id: 4, Title: `3` },
+      { Id: 5, Title: `4` },
+    ]);
+    await page.reload();
+
     for (let i = 0; i <= 4; i++) {
-      await grid.addNewRow({ index: i, value: `${i}` });
       await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: false });
     }
   });
@@ -398,11 +439,14 @@ test.describe('User single select - filter, sort & GroupBy', () => {
 test.describe('User multiple select', () => {
   let dashboard: DashboardPage, grid: GridPage, topbar: TopbarPage;
   let context: any;
+  let api: Api<any>;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     const initRsp = await beforeEachInit({ page: page });
     context = initRsp.context;
     dashboard = initRsp.dashboard;
+    api = initRsp.api;
     grid = dashboard.grid;
     topbar = dashboard.grid.topbar;
 
@@ -410,6 +454,9 @@ test.describe('User multiple select', () => {
 
     await grid.column.create({ title: 'User', type: 'User' });
     await grid.column.userOption.allowMultipleUser({ columnTitle: 'User', allowMultiple: true });
+
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'Sheet1').id;
   });
 
   test.afterEach(async () => {
@@ -417,7 +464,8 @@ test.describe('User multiple select', () => {
   });
 
   test('Verify the default option count, select default value and verify', async () => {
-    await grid.addNewRow({ index: 0, value: 'Row 0' });
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [{ Id: 1, Title: `Row 0` }]);
+    await grid.rootPage.reload();
 
     if (!isEE()) {
       await grid.column.userOption.verifyDefaultValueOptionCount({ columnTitle: 'User', totalCount: 5 });
@@ -436,7 +484,9 @@ test.describe('User multiple select', () => {
     });
 
     // Add new row and verify default value is added in new cell
-    await grid.addNewRow({ index: 1, value: 'Row 1' });
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [{ Id: 2, Title: `Row 1` }]);
+    await grid.rootPage.reload();
+
     await grid.cell.userOption.verify({
       index: 1,
       columnHeader: 'User',
@@ -452,10 +502,17 @@ test.describe('User multiple select', () => {
   });
 
   test('Field operations - duplicate column, convert to SingleLineText', async () => {
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 1, Title: `Row 0` },
+      { Id: 2, Title: `Row 1` },
+      { Id: 3, Title: `Row 2` },
+      { Id: 4, Title: `Row 3` },
+      { Id: 5, Title: `Row 4` },
+    ]);
+    await grid.rootPage.reload();
+
     let counter = 1;
     for (let i = 0; i <= 4; i++) {
-      await grid.addNewRow({ index: i, value: `Row ${i}` });
-
       await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: true });
       await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[counter], multiSelect: true });
 
@@ -497,11 +554,18 @@ test.describe('User multiple select', () => {
   });
 
   test('Cell Operation - edit, copy-paste and delete', async () => {
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 1, Title: `Row 0` },
+      { Id: 2, Title: `Row 1` },
+      { Id: 3, Title: `Row 2` },
+      { Id: 4, Title: `Row 3` },
+      { Id: 5, Title: `Row 4` },
+    ]);
+    await grid.rootPage.reload();
+
     // Edit, refresh and verify
     let counter = 1;
     for (let i = 0; i <= 4; i++) {
-      await grid.addNewRow({ index: i, value: `Row ${i}` });
-
       await grid.cell.userOption.select({
         index: i,
         columnHeader: 'User',
@@ -617,11 +681,14 @@ test.describe('User multiple select - filter, sort & GroupBy', () => {
 
   let dashboard: DashboardPage, grid: GridPage, toolbar: ToolbarPage;
   let context: any;
+  let api: Api<any>;
+  let tableId: string;
 
   test.beforeEach(async ({ page }) => {
     const initRsp = await beforeEachInit({ page: page });
     context = initRsp.context;
     dashboard = initRsp.dashboard;
+    api = initRsp.api;
     grid = dashboard.grid;
     toolbar = dashboard.grid.toolbar;
 
@@ -630,9 +697,20 @@ test.describe('User multiple select - filter, sort & GroupBy', () => {
     await grid.column.create({ title: 'User', type: 'User' });
     await grid.column.userOption.allowMultipleUser({ columnTitle: 'User', allowMultiple: true });
 
+    const tables = await api.dbTable.list(context.base.id);
+    tableId = tables.list.find((table: any) => table.title === 'sheet1').id;
+
+    await api.dbTableRow.bulkCreate('noco', context.base.id, tableId, [
+      { Id: 1, Title: `0` },
+      { Id: 2, Title: `1` },
+      { Id: 3, Title: `2` },
+      { Id: 4, Title: `3` },
+      { Id: 5, Title: `4` },
+    ]);
+    await grid.rootPage.reload();
+
     let counter = 2;
     for (let i = 0; i <= 4; i++) {
-      await grid.addNewRow({ index: i, value: `${i}` });
       await grid.cell.userOption.select({ index: i, columnHeader: 'User', option: users[i], multiSelect: true });
       if (i !== 0) {
         await grid.cell.userOption.select({