diff --git a/apps/frontend/src/components/settings/github.component.tsx b/apps/frontend/src/components/settings/github.component.tsx
index fabd714a..4d039247 100644
--- a/apps/frontend/src/components/settings/github.component.tsx
+++ b/apps/frontend/src/components/settings/github.component.tsx
@@ -1,141 +1,223 @@
-"use client";
-import Image from "next/image";
-import {Button} from "@gitroom/react/form/button";
-import {FC, useCallback, useEffect, useState} from "react";
-import {useFetch} from "@gitroom/helpers/utils/custom.fetch";
-import {deleteDialog} from "@gitroom/react/helpers/delete.dialog";
+'use client';
+import Image from 'next/image';
+import { Button } from '@gitroom/react/form/button';
+import { FC, useCallback, useEffect, useState } from 'react';
+import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
+import { deleteDialog } from '@gitroom/react/helpers/delete.dialog';
 
-const ConnectedComponent: FC<{id: string, login: string, deleteRepository: () => void}> = (props) => {
-    const {id, login, deleteRepository} = props;
-    const fetch = useFetch();
-    const disconnect = useCallback(async () => {
-        if (!await deleteDialog('Are you sure you want to disconnect this repository?')) {
-            return ;
-        }
-        deleteRepository();
-        await fetch(`/settings/repository/${id}`, {
-            method: 'DELETE'
-        });
-    }, []);
-    return (
-        <div className="my-[16px] mt-[16px] h-[90px] bg-sixth border-fifth border rounded-[4px] p-[24px]">
-            <div className="flex items-center gap-[8px] font-[Inter]">
-                <div><Image src="/icons/github.svg" alt="GitHub" width={40} height={40}/></div>
-                <div className="flex-1"><strong>Connected:</strong> {login}</div>
-                <Button onClick={disconnect}>Disconnect</Button>
-            </div>
+const ConnectedComponent: FC<{
+  id: string;
+  login: string;
+  deleteRepository: () => void;
+}> = (props) => {
+  const { id, login, deleteRepository } = props;
+  const fetch = useFetch();
+  const disconnect = useCallback(async () => {
+    if (
+      !(await deleteDialog(
+        'Are you sure you want to disconnect this repository?'
+      ))
+    ) {
+      return;
+    }
+    deleteRepository();
+    await fetch(`/settings/repository/${id}`, {
+      method: 'DELETE',
+    });
+  }, []);
+  return (
+    <div className="my-[16px] mt-[16px] h-[90px] bg-sixth border-fifth border rounded-[4px] p-[24px]">
+      <div className="flex items-center gap-[8px] font-[Inter]">
+        <div>
+          <Image src="/icons/github.svg" alt="GitHub" width={40} height={40} />
         </div>
-    );
-}
+        <div className="flex-1">
+          <strong>Connected:</strong> {login}
+        </div>
+        <Button onClick={disconnect}>Disconnect</Button>
+      </div>
+    </div>
+  );
+};
 
-const RepositoryComponent: FC<{id: string, login?: string, setRepo: (name: string) => void}> = (props) => {
-    const {setRepo, login, id} = props;
-    const [repositories, setRepositories] = useState<Array<{id: string, name: string}>>([]);
-    const fetch = useFetch();
+const RepositoryComponent: FC<{
+  id: string;
+  login?: string;
+  setRepo: (name: string) => void;
+}> = (props) => {
+  const { setRepo, login, id } = props;
+  const [repositories, setRepositories] = useState<
+    Array<{ id: string; name: string }>
+  >([]);
+  const fetch = useFetch();
 
-    const loadRepositories = useCallback(async () => {
-        const {repositories: repolist} = await (await fetch(`/settings/organizations/${id}/${login}`)).json();
-        setRepositories(repolist);
-    }, [login, id]);
+  const loadRepositories = useCallback(async () => {
+    const { repositories: repolist } = await (
+      await fetch(`/settings/organizations/${id}/${login}`)
+    ).json();
+    setRepositories(repolist);
+  }, [login, id]);
 
-    useEffect(() => {
-        setRepositories([]);
-        if (!login) {
-            return ;
-        }
-
-        loadRepositories();
-    }, [login]);
-    if (!login || !repositories.length) {
-        return <></>;
+  useEffect(() => {
+    setRepositories([]);
+    if (!login) {
+      return;
     }
 
-    return (
-        <select className="border border-fifth bg-transparent h-[40px]" onChange={(e) => setRepo(e.target.value)}>
-            <option value="">Choose a repository</option>
-            {repositories.map(o => (<option key={o.id} value={o.name}>{o.name}</option>))}
-        </select>)
-}
+    loadRepositories();
+  }, [login]);
+  if (!login || !repositories.length) {
+    return <></>;
+  }
 
-const ConnectComponent: FC<{ setConnected: (name: string) => void, id: string, login: string, organizations: Array<{ id: string, login: string }> }> = (props) => {
-    const {id, setConnected} = props;
-    const [repo, setRepo] = useState<undefined | string>();
-    const [select, setSelect] = useState<undefined | string>();
-    const fetch = useFetch();
+  return (
+    <select
+      className="border border-fifth bg-transparent h-[40px]"
+      onChange={(e) => setRepo(e.target.value)}
+    >
+      <option value="">Choose a repository</option>
+      {repositories.map((o) => (
+        <option key={o.id} value={o.name}>
+          {o.name}
+        </option>
+      ))}
+    </select>
+  );
+};
 
-    const completeConnection = useCallback(async () => {
-        setConnected(`${select}/${repo}`);
-        await (await fetch(`/settings/organizations/${id}`, {
-            method: 'POST',
-            body: JSON.stringify({login: `${select}/${repo}`})
-        })).json();
-    }, [repo, select]);
+const ConnectComponent: FC<{
+  setConnected: (name: string) => void;
+  id: string;
+  login: string;
+  organizations: Array<{ id: string; login: string }>;
+  deleteRepository: () => void;
+}> = (props) => {
+  const { id, setConnected, deleteRepository } = props;
+  const [repo, setRepo] = useState<undefined | string>();
+  const [select, setSelect] = useState<undefined | string>();
+  const fetch = useFetch();
 
-    return (
-        <div className="my-[16px] mt-[16px] h-[90px] bg-sixth border-fifth border rounded-[4px] p-[24px]">
-            <div className="flex items-center gap-[8px] font-[Inter]">
-                <div><Image src="/icons/github.svg" alt="GitHub" width={40} height={40}/></div>
-                <div className="flex-1">Connect your repository</div>
-                <select className="border border-fifth bg-transparent h-[40px]" value={select} onChange={(e) => setSelect(e.target.value)}>
-                    <option value="">Choose an organization</option>
-                    {props.organizations.map(o => (
-                        <option key={o.id} value={o.login}>{o.login}</option>
-                    ))}
-                </select>
-                <RepositoryComponent id={id} login={select} setRepo={setRepo} />
-                {!!repo && <Button onClick={completeConnection}>Connect</Button>}
-            </div>
+  const cancelConnection = useCallback(async () => {
+    await (
+      await fetch(`/settings/repository/${id}`, {
+        method: 'DELETE',
+      })
+    ).json();
+
+    deleteRepository();
+  }, []);
+
+  const completeConnection = useCallback(async () => {
+    setConnected(`${select}/${repo}`);
+    await (
+      await fetch(`/settings/organizations/${id}`, {
+        method: 'POST',
+        body: JSON.stringify({ login: `${select}/${repo}` }),
+      })
+    ).json();
+  }, [repo, select]);
+
+  return (
+    <div className="my-[16px] mt-[16px] h-[90px] bg-sixth border-fifth border rounded-[4px] p-[24px]">
+      <div className="flex items-center gap-[8px] font-[Inter]">
+        <div>
+          <Image src="/icons/github.svg" alt="GitHub" width={40} height={40} />
         </div>
-    );
-}
+        <div className="flex-1">Connect your repository</div>
+        <Button
+          className="bg-transparent border-0 text-gray"
+          onClick={cancelConnection}
+        >
+          Cancel
+        </Button>
+        <select
+          className="border border-fifth bg-transparent h-[40px]"
+          value={select}
+          onChange={(e) => setSelect(e.target.value)}
+        >
+          <option value="">Choose an organization</option>
+          {props.organizations.map((o) => (
+            <option key={o.id} value={o.login}>
+              {o.login}
+            </option>
+          ))}
+        </select>
+        <RepositoryComponent id={id} login={select} setRepo={setRepo} />
+        {!!repo && <Button onClick={completeConnection}>Connect</Button>}
+      </div>
+    </div>
+  );
+};
 
-export const GithubComponent: FC<{ organizations: Array<{ login: string, id: string }>, github: Array<{ id: string, login: string }> }> = (props) => {
-    const {github, organizations} = props;
-    const [githubState, setGithubState] = useState(github);
-    const fetch = useFetch();
-    const connect = useCallback(async () => {
-        const {url} = await (await fetch('/settings/github/url')).json();
-        window.location.href = url;
-    }, []);
+export const GithubComponent: FC<{
+  organizations: Array<{ login: string; id: string }>;
+  github: Array<{ id: string; login: string }>;
+}> = (props) => {
+  const { github, organizations } = props;
+  const [githubState, setGithubState] = useState(github);
+  const fetch = useFetch();
+  const connect = useCallback(async () => {
+    const { url } = await (await fetch('/settings/github/url')).json();
+    window.location.href = url;
+  }, []);
 
-    const setConnected = useCallback((g: {id: string, login: string}) => (name: string) => {
-        setGithubState((gitlibs) => {
-            return gitlibs.map((git, index) => {
-                if (git.id === g.id) {
-                    return {id: g.id, login: name};
-                }
-                return git;
-            })
+  const setConnected = useCallback(
+    (g: { id: string; login: string }) => (name: string) => {
+      setGithubState((gitlibs) => {
+        return gitlibs.map((git, index) => {
+          if (git.id === g.id) {
+            return { id: g.id, login: name };
+          }
+          return git;
         });
-    }, [githubState]);
+      });
+    },
+    [githubState]
+  );
 
-    const deleteConnect = useCallback((g: {id: string, login: string}) => () => {
-        setGithubState((gitlibs) => {
-            return gitlibs.filter((git, index) => {
-                return git.id !== g.id;
-            })
+  const deleteConnect = useCallback(
+    (g: { id: string; login: string }) => () => {
+      setGithubState((gitlibs) => {
+        return gitlibs.filter((git, index) => {
+          return git.id !== g.id;
         });
-    }, [githubState]);
+      });
+    },
+    [githubState]
+  );
 
-    return (
+  return (
+    <>
+      {githubState.map((g) => (
         <>
-            {githubState.map(g => (
-                <>
-                    {!g.login ? (
-                        <ConnectComponent setConnected={setConnected(g)} organizations={organizations} {...g} />
-                    ): (
-                        <ConnectedComponent deleteRepository={deleteConnect(g)} {...g} />
-                    )}
-                </>
-            ))}
-            {githubState.filter(f => !f.login).length === 0 && (<div className="my-[16px] mt-[16px] h-[90px] bg-sixth border-fifth border rounded-[4px] p-[24px]">
-                    <div className="flex items-center gap-[8px] font-[Inter]">
-                        <div><Image src="/icons/github.svg" alt="GitHub" width={40} height={40}/></div>
-                        <div className="flex-1">Connect your repository</div>
-                        <Button onClick={connect}>Connect</Button>
-                    </div>
-                </div>
-            )}
+          {!g.login ? (
+            <ConnectComponent
+              deleteRepository={deleteConnect(g)}
+              setConnected={setConnected(g)}
+              organizations={organizations}
+              {...g}
+            />
+          ) : (
+            <ConnectedComponent deleteRepository={deleteConnect(g)} {...g} />
+          )}
         </>
-    )
-}
\ No newline at end of file
+      ))}
+      {githubState.filter((f) => !f.login).length === 0 && (
+        <div className="my-[16px] mt-[16px] h-[90px] bg-sixth border-fifth border rounded-[4px] p-[24px]">
+          <div className="flex items-center gap-[8px] font-[Inter]">
+            <div>
+              <Image
+                src="/icons/github.svg"
+                alt="GitHub"
+                width={40}
+                height={40}
+              />
+            </div>
+            <div className="flex-1">Connect your repository</div>
+            <Button onClick={connect}>Connect</Button>
+          </div>
+        </div>
+      )}
+    </>
+  );
+};
diff --git a/apps/frontend/src/components/settings/settings.component.tsx b/apps/frontend/src/components/settings/settings.component.tsx
index 0f69fe1d..7e5912a4 100644
--- a/apps/frontend/src/components/settings/settings.component.tsx
+++ b/apps/frontend/src/components/settings/settings.component.tsx
@@ -15,8 +15,6 @@ export const SettingsComponent = () => {
 
   const fetch = useFetch();
 
-  console.log(user);
-
   const load = useCallback(async (path: string) => {
     const { github } = await (await fetch('/settings/github')).json();
     if (!github) {