diff --git a/components/dashboard/.eslintrc.js b/components/dashboard/.eslintrc.js
index 6a17f156776f27..8b0658d9306c4c 100644
--- a/components/dashboard/.eslintrc.js
+++ b/components/dashboard/.eslintrc.js
@@ -7,4 +7,7 @@
 module.exports = {
     root: true,
     extends: ['react-app'],
+    rules: {
+        "import/no-anonymous-default-export": "off",
+    }
 }
diff --git a/components/dashboard/src/App.tsx b/components/dashboard/src/App.tsx
index cb928766d56776..bc61e206a75e5f 100644
--- a/components/dashboard/src/App.tsx
+++ b/components/dashboard/src/App.tsx
@@ -42,7 +42,7 @@ const Projects = React.lazy(() => import(/* webpackPrefetch: true */ './projects
 const Project = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Project'));
 const Prebuilds = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Prebuilds'));
 const Prebuild = React.lazy(() => import(/* webpackPrefetch: true */ './projects/Prebuild'));
-const InstallGitHubApp = React.lazy(() => import(/* webpackPrefetch: true */ './prebuilds/InstallGitHubApp'));
+const InstallGitHubApp = React.lazy(() => import(/* webpackPrefetch: true */ './projects/InstallGitHubApp'));
 const FromReferrer = React.lazy(() => import(/* webpackPrefetch: true */ './FromReferrer'));
 const UserSearch = React.lazy(() => import(/* webpackPrefetch: true */ './admin/UserSearch'));
 const WorkspacesSearch = React.lazy(() => import(/* webpackPrefetch: true */ './admin/WorkspacesSearch'));
diff --git a/components/dashboard/src/prebuilds/InstallGitHubApp.tsx b/components/dashboard/src/projects/InstallGitHubApp.tsx
similarity index 100%
rename from components/dashboard/src/prebuilds/InstallGitHubApp.tsx
rename to components/dashboard/src/projects/InstallGitHubApp.tsx
diff --git a/components/dashboard/src/projects/Prebuilds.tsx b/components/dashboard/src/projects/Prebuilds.tsx
index 625d3bdab5d99d..2bf8fb228b7899 100644
--- a/components/dashboard/src/projects/Prebuilds.tsx
+++ b/components/dashboard/src/projects/Prebuilds.tsx
@@ -37,6 +37,7 @@ export default function () {
     const [searchFilter, setSearchFilter] = useState<string | undefined>();
     const [statusFilter, setStatusFilter] = useState<PrebuiltWorkspaceState | undefined>();
 
+    const [isLoadingPrebuilds, setIsLoadingPrebuilds] = useState<boolean>(true);
     const [prebuilds, setPrebuilds] = useState<PrebuildWithStatus[]>([]);
 
     useEffect(() => {
@@ -47,13 +48,16 @@ export default function () {
             onPrebuildUpdate: (update: PrebuildWithStatus) => {
                 if (update.info.projectId === project.id) {
                     setPrebuilds(prev => [update, ...prev.filter(p => p.info.id !== update.info.id)]);
+                    setIsLoadingPrebuilds(false);
                 }
             }
         });
 
         (async () => {
+            setIsLoadingPrebuilds(true);
             const prebuilds = await getGitpodService().server.findPrebuilds({ projectId: project.id });
             setPrebuilds(prebuilds);
+            setIsLoadingPrebuilds(false);
         })();
 
         return () => {
@@ -78,7 +82,7 @@ export default function () {
                 setProject(newProject);
             }
         })();
-    }, [teams]);
+    }, [projectSlug, team, teams]);
 
     const prebuildContextMenu = (p: PrebuildWithStatus) => {
         const isFailed = p.status === "aborted" || p.status === "timeout" || !!p.error;
@@ -166,7 +170,7 @@ export default function () {
                 <div className="py-3 pl-3">
                     <DropDown prefix="Prebuild Status: " contextMenuWidth="w-32" entries={statusFilterEntries()} />
                 </div>
-                {(!!project && prebuilds.length === 0) &&
+                {(!isLoadingPrebuilds && prebuilds.length === 0) &&
                     <button onClick={() => triggerPrebuild(null)} className="ml-2">Run Prebuild</button>}
             </div>
             <ItemsList className="mt-2">
@@ -181,6 +185,10 @@ export default function () {
                         <span>Branch</span>
                     </ItemField>
                 </Item>
+                {isLoadingPrebuilds && <div className="flex items-center justify-center space-x-2 text-gray-400 text-sm pt-16">
+                    <img alt="" className="h-4 w-4 animate-spin" src={Spinner} />
+                    <span>Fetching prebuilds...</span>
+                </div>}
                 {prebuilds.filter(filter).sort(prebuildSorter).map((p, index) => <Item key={`prebuild-${p.info.id}`} className="grid grid-cols-3">
                     <ItemField className="flex items-center my-auto">
                         <Link to={`/${!!team ? 't/'+team.slug : 'projects'}/${projectSlug}/${p.info.id}`} className="cursor-pointer">
diff --git a/components/dashboard/src/projects/Project.tsx b/components/dashboard/src/projects/Project.tsx
index 00fd96061dd62e..61732b5c3379d4 100644
--- a/components/dashboard/src/projects/Project.tsx
+++ b/components/dashboard/src/projects/Project.tsx
@@ -181,7 +181,7 @@ export default function () {
             {showAuthBanner ? (
                 <div className="mt-8 rounded-xl text-gray-500 bg-gray-50 dark:bg-gray-800 flex-col">
                     <div className="p-8 text-center">
-                        <img src={NoAccess} title="No Access" className="m-auto mb-4" />
+                        <img src={NoAccess} alt="" title="No Access" className="m-auto mb-4" />
                         <div className="text-center text-gray-600 dark:text-gray-50 pb-3 font-bold">
                             No Access
                         </div>