diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7a8c69..7a6b28c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,6 +61,9 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
+      - name: Install dependencies for web
+        run: npm install --filter=@tech-companies-portugal/web
+  
       - name: Cache Playwright browsers
         id: playwright-cache
         uses: actions/cache@v3
@@ -72,9 +75,6 @@ jobs:
         if: steps.playwright-cache.outputs.cache-hit != 'true'
         run: npx playwright install chromium --with-deps
 
-      - name: Install dependencies for web
-        run: npm install --filter=@tech-companies-portugal/web
-
       - name: Run Playwright tests
         run: npm run test:e2e:web
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c280855..421484d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,8 +1,21 @@
 {
   "editor.defaultFormatter": "biomejs.biome",
-
+  "[javascript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
   "editor.codeActionsOnSave": {
-    "source.organizeImports": "always",
-    "source.fixAll.biome": "explicit",
-  }
-}
+    "quickfix.biome": "explicit",
+    "source.organizeImports.biome": "explicit"
+  },
+  "editor.formatOnSave": true,
+  "typescript.tsdk": "node_modules/typescript/lib",
+}
\ No newline at end of file
diff --git a/apps/web/package.json b/apps/web/package.json
index 34e8c77..1394f89 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -57,4 +57,4 @@
     "@types/react-dom": "19.0.2",
     "react-is": "19.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/web/src/app/(companies-list)/layout.tsx b/apps/web/src/app/(companies-list)/layout.tsx
index 68c3c03..8d09661 100644
--- a/apps/web/src/app/(companies-list)/layout.tsx
+++ b/apps/web/src/app/(companies-list)/layout.tsx
@@ -1,16 +1,20 @@
 import CompaniesHeader from "@/components/CompaniesHeader";
+import Footer from "@/components/Footer";
 import { Skeleton } from "@/components/ui/skeleton";
 import { LayoutProps } from "@/lib/types";
 import { Suspense } from "react";
 
 export default function AppLayout({ children }: LayoutProps) {
   return (
-    <main className="flex-1 flex-col w-full">
-      <CompaniesHeader />
-      <Suspense fallback={<AppLoading />}>
-        <div className="mx-auto flex w-full max-w-5xl p-3">{children}</div>
-      </Suspense>
-    </main>
+    <>
+      <main className="flex-1 flex-col w-full">
+        <CompaniesHeader />
+        <Suspense fallback={<AppLoading />}>
+          <div className="mx-auto flex w-full max-w-5xl p-3">{children}</div>
+        </Suspense>
+      </main>
+      <Footer />
+    </>
   );
 }
 
diff --git a/apps/web/src/app/category/[category]/layout.tsx b/apps/web/src/app/category/[category]/layout.tsx
new file mode 100644
index 0000000..1cc4567
--- /dev/null
+++ b/apps/web/src/app/category/[category]/layout.tsx
@@ -0,0 +1,12 @@
+import Footer from "@/components/Footer";
+import { LayoutProps } from "@/lib/types";
+import { Suspense } from "react";
+
+export default function CategoryPageLayout({ children }: LayoutProps) {
+  return (
+    <>
+      <Suspense fallback={<div>Loading...</div>}>{children}</Suspense>
+      <Footer />
+    </>
+  );
+}
diff --git a/apps/web/src/app/category/[category]/page.tsx b/apps/web/src/app/category/[category]/page.tsx
new file mode 100644
index 0000000..6017c0f
--- /dev/null
+++ b/apps/web/src/app/category/[category]/page.tsx
@@ -0,0 +1,96 @@
+import { Breadcrumb } from "@/components/Breadcrumb";
+import CompaniesList from "@/components/CompaniesList";
+import {
+  APP_URL,
+  defaultMetadata,
+  defaultOpenGraphMetadata,
+  defaultTwitterMetadata,
+} from "@/lib/metadata";
+import { getParsedCompaniesData } from "@/lib/parser/companies";
+import { NextParams } from "@/lib/types";
+import { Metadata } from "next";
+import { Suspense } from "react";
+
+export async function generateMetadata({
+  params,
+}: {
+  params: NextParams<{ category: string }>;
+}): Promise<Metadata> {
+  const { category: categoryParam } = await params;
+
+  const category = decodeURIComponent(categoryParam);
+
+  const title = `${category} Companies | Tech Companies Portugal`;
+  const description = `Discover tech companies in the ${category} sector. Find job opportunities and connect with ${category} tech companies in Portugal.`;
+  const keywords = `${category} tech companies, ${category} software companies, IT employers ${category}, technology sector ${category}`;
+
+  const metadata = {
+    ...defaultMetadata,
+    title,
+    description,
+    keywords,
+    alternates: {
+      canonical: `${APP_URL}/category/${category}`,
+    },
+    openGraph: {
+      ...defaultOpenGraphMetadata,
+      title,
+      description,
+      url: `${APP_URL}/category/${category}`,
+      images: [`api/og?title=${title}&description=${description}`],
+    },
+    twitter: {
+      ...defaultTwitterMetadata,
+      title,
+      description,
+      images: [`api/og?title=${title}&description=${description}`],
+    },
+  } satisfies Metadata;
+
+  return metadata;
+}
+
+export async function generateStaticParams() {
+  const { availableCategories } = await getParsedCompaniesData();
+
+  return availableCategories.map((category) => ({
+    category,
+  }));
+}
+
+export default async function CategoryPage({
+  params,
+}: {
+  params: NextParams<{ category: string }>;
+}) {
+  const { category: categoryParam } = await params;
+
+  const category = decodeURIComponent(categoryParam);
+
+  const { companies, updatedAtISODate } = await getParsedCompaniesData();
+
+  const filteredCompanies = companies.filter((company) =>
+    company.categories.includes(category),
+  );
+
+  return (
+    <section className="mx-auto flex w-full max-w-5xl p-3 relative flex-1">
+      <div className="flex flex-col gap-5 w-full">
+        <Breadcrumb
+          items={[
+            { label: "Category", className: "text-muted-foreground" },
+            { label: category },
+          ]}
+        />
+        <h1 className="text-2xl font-bold">{category} Companies</h1>
+        <Suspense>
+          <CompaniesList
+            allCompanies={filteredCompanies}
+            updatedAtISODate={updatedAtISODate}
+            allowSearchParams={false}
+          />
+        </Suspense>
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/src/app/category/sitemap.ts b/apps/web/src/app/category/sitemap.ts
new file mode 100644
index 0000000..db66be4
--- /dev/null
+++ b/apps/web/src/app/category/sitemap.ts
@@ -0,0 +1,15 @@
+import { APP_URL } from "@/lib/metadata";
+import { getParsedCompaniesData } from "@/lib/parser/companies";
+import { MetadataRoute } from "next";
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const { availableCategories, updatedAtISODate } =
+    await getParsedCompaniesData();
+
+  let categoriesRoutes = availableCategories.map((category) => ({
+    url: `${APP_URL}/category/${category}`,
+    lastModified: updatedAtISODate,
+  }));
+
+  return [...categoriesRoutes];
+}
diff --git a/apps/web/src/app/company/[slug]/layout.tsx b/apps/web/src/app/company/[slug]/layout.tsx
index 68cedec..55b0676 100644
--- a/apps/web/src/app/company/[slug]/layout.tsx
+++ b/apps/web/src/app/company/[slug]/layout.tsx
@@ -1,9 +1,15 @@
+import SimpleFooter from "@/components/SimpleFooter";
 import { Skeleton } from "@/components/ui/skeleton";
 import { LayoutProps } from "@/lib/types";
 import { Suspense } from "react";
 
 export default function CompanyPageLayout({ children }: LayoutProps) {
-  return <Suspense fallback={<CompanyLoading />}>{children}</Suspense>;
+  return (
+    <>
+      <Suspense fallback={<CompanyLoading />}>{children}</Suspense>
+      <SimpleFooter />
+    </>
+  );
 }
 
 const CompanyLoading = () => {
diff --git a/apps/web/src/app/company/[slug]/page.tsx b/apps/web/src/app/company/[slug]/page.tsx
index ca822f0..3453c2a 100644
--- a/apps/web/src/app/company/[slug]/page.tsx
+++ b/apps/web/src/app/company/[slug]/page.tsx
@@ -18,7 +18,7 @@ import { notFound } from "next/navigation";
 import { Metadata } from "next/types";
 
 // force generation on demand for paths not known at build time
-export const dynamicParams = true;
+// export const dynamicParams = true;
 
 export async function generateStaticParams() {
   const companies = await getParsedCompaniesData();
@@ -29,7 +29,7 @@ export async function generateStaticParams() {
 export async function generateMetadata({
   params,
 }: {
-  params: NextParams;
+  params: NextParams<{ slug: string }>;
 }): Promise<Metadata | void> {
   const { slug } = await params;
 
@@ -39,7 +39,7 @@ export async function generateMetadata({
     return;
   }
 
-  const title = `${company.name} - Leading Tech Company in Portugal | Explore Careers & More`;
+  const title = `${company.name} | Leading Tech Company in Portugal - Profile & Careers`;
   const description = company.description;
   const keywords = `${company.name}, Tech Company, Careers, Portugal`;
 
@@ -69,7 +69,11 @@ export async function generateMetadata({
   return metadata;
 }
 
-export default async function CompanyPage({ params }: { params: NextParams }) {
+export default async function CompanyPage({
+  params,
+}: {
+  params: NextParams<{ slug: string }>;
+}) {
   const { slug } = await params;
 
   const company = await getParsedCompanyBySlug(slug);
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 9d0ba1e..a41b0df 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -1,4 +1,3 @@
-import Footer from "@/components/Footer";
 import Navbar from "@/components/Navbar";
 import DotPattern from "@/components/ui/dot-pattern";
 import { GeistMono, GeistSans } from "@/lib/fonts";
@@ -14,7 +13,6 @@ import { AnalyticsProvider } from "@tech-companies-portugal/analytics/client";
 import { Metadata, Viewport } from "next/types";
 import { NuqsAdapter } from "nuqs/adapters/next/app";
 import "./globals.css";
-
 export const metadata: Metadata = {
   ...defaultMetadata,
   twitter: {
@@ -51,7 +49,6 @@ export default function RootLayout({ children }: LayoutProps) {
           <NuqsAdapter>
             <Navbar />
             {children}
-            <Footer />
             <DotPattern
               className={cn(
                 "[mask-image:radial-gradient(620px_circle_at_center,white,transparent)] fixed inset-0 -z-10",
diff --git a/apps/web/src/app/location/[location]/layout.tsx b/apps/web/src/app/location/[location]/layout.tsx
new file mode 100644
index 0000000..de1ceee
--- /dev/null
+++ b/apps/web/src/app/location/[location]/layout.tsx
@@ -0,0 +1,12 @@
+import Footer from "@/components/Footer";
+import { LayoutProps } from "@/lib/types";
+import { Suspense } from "react";
+
+export default function LocationPageLayout({ children }: LayoutProps) {
+  return (
+    <>
+      <Suspense fallback={<div>Loading...</div>}>{children}</Suspense>
+      <Footer />
+    </>
+  );
+}
diff --git a/apps/web/src/app/location/[location]/page.tsx b/apps/web/src/app/location/[location]/page.tsx
new file mode 100644
index 0000000..ba2a545
--- /dev/null
+++ b/apps/web/src/app/location/[location]/page.tsx
@@ -0,0 +1,97 @@
+import { Breadcrumb } from "@/components/Breadcrumb";
+import CompaniesList from "@/components/CompaniesList";
+import {
+  APP_URL,
+  defaultMetadata,
+  defaultOpenGraphMetadata,
+  defaultTwitterMetadata,
+} from "@/lib/metadata";
+import { getParsedCompaniesData } from "@/lib/parser/companies";
+import { NextParams } from "@/lib/types";
+import { Metadata } from "next";
+import { Suspense } from "react";
+
+export async function generateMetadata({
+  params,
+}: {
+  params: NextParams<{ location: string }>;
+}): Promise<Metadata> {
+  const { location: locationParam } = await params;
+
+  const location = decodeURIComponent(locationParam);
+
+  const title = `Companies in ${location} | Tech Companies Portugal`;
+  const description = `Discover tech companies based in ${location} - Portugal. Find job opportunities and connect with tech companies in ${location} - Portugal.`;
+  const keywords = `tech companies in ${location}, Portugal tech jobs, ${location} software companies, IT employers ${location}`;
+
+  const metadata = {
+    ...defaultMetadata,
+    title,
+    description,
+    keywords,
+    alternates: {
+      canonical: `${APP_URL}/location/${location}`,
+    },
+    openGraph: {
+      ...defaultOpenGraphMetadata,
+      title,
+      description,
+      url: `${APP_URL}/location/${location}`,
+      images: [`api/og?title=${title}&description=${description}`],
+    },
+    twitter: {
+      ...defaultTwitterMetadata,
+      title,
+      description,
+      images: [`api/og?title=${title}&description=${description}`],
+    },
+  } satisfies Metadata;
+
+  return metadata;
+}
+
+export async function generateStaticParams() {
+  const { availableLocations } = await getParsedCompaniesData();
+
+  return availableLocations.map((location) => ({
+    location,
+  }));
+}
+
+export default async function LocationPage({
+  params,
+}: {
+  params: NextParams<{ location: string }>;
+}) {
+  const { location: locationParam } = await params;
+
+  const location = decodeURIComponent(locationParam);
+
+  const { companies, updatedAtISODate } = await getParsedCompaniesData();
+
+  const filteredCompanies = companies.filter((company) =>
+    company.locations.includes(location),
+  );
+
+  return (
+    <section className="mx-auto flex w-full max-w-5xl p-3 relative">
+      <div className="flex flex-col gap-5 w-full">
+        <Breadcrumb
+          items={[
+            { label: "Location", className: "text-muted-foreground" },
+            { label: location },
+          ]}
+        />
+        <h1 className="text-2xl font-bold">Companies in {location}</h1>
+
+        <Suspense>
+          <CompaniesList
+            allCompanies={filteredCompanies}
+            updatedAtISODate={updatedAtISODate}
+            allowSearchParams={false}
+          />
+        </Suspense>
+      </div>
+    </section>
+  );
+}
diff --git a/apps/web/src/app/location/sitemap.ts b/apps/web/src/app/location/sitemap.ts
new file mode 100644
index 0000000..628d1d6
--- /dev/null
+++ b/apps/web/src/app/location/sitemap.ts
@@ -0,0 +1,15 @@
+import { APP_URL } from "@/lib/metadata";
+import { getParsedCompaniesData } from "@/lib/parser/companies";
+import { MetadataRoute } from "next";
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const { availableLocations, updatedAtISODate } =
+    await getParsedCompaniesData();
+
+  let locationsRoutes = availableLocations.map((location) => ({
+    url: `${APP_URL}/location/${location}`,
+    lastModified: updatedAtISODate,
+  }));
+
+  return [...locationsRoutes];
+}
diff --git a/apps/web/src/app/robots.ts b/apps/web/src/app/robots.ts
index f437f0b..74ba4b6 100644
--- a/apps/web/src/app/robots.ts
+++ b/apps/web/src/app/robots.ts
@@ -10,7 +10,12 @@ export default function robots(): MetadataRoute.Robots {
         disallow: ["/api/*", "/admin/*"],
       },
     ],
-    sitemap: [`${APP_URL}/sitemap.xml`, `${APP_URL}/company/sitemap.xml`],
+    sitemap: [
+      `${APP_URL}/sitemap.xml`,
+      `${APP_URL}/company/sitemap.xml`,
+      `${APP_URL}/category/sitemap.xml`,
+      `${APP_URL}/location/sitemap.xml`,
+    ],
     host: `${APP_URL}`,
   };
 }
diff --git a/apps/web/src/components/Breadcrumb.tsx b/apps/web/src/components/Breadcrumb.tsx
new file mode 100644
index 0000000..5ddf321
--- /dev/null
+++ b/apps/web/src/components/Breadcrumb.tsx
@@ -0,0 +1,54 @@
+import { cn } from "@/lib/utils";
+import { ChevronRight, Home } from "lucide-react";
+import Link from "next/link";
+
+export type BreadcrumbItem = {
+  label: string;
+  href?: string;
+  className?: string;
+};
+
+type BreadcrumbProps = {
+  items: BreadcrumbItem[];
+  className?: string;
+};
+
+export function Breadcrumb({ items, className }: BreadcrumbProps) {
+  return (
+    <nav aria-label="Breadcrumb" className={cn("mb-4", className)}>
+      <ol className="flex items-center space-x-1 text-sm text-muted-foreground">
+        <li>
+          <Link
+            href="/"
+            className="flex items-center hover:text-foreground transition-colors font-medium text-foreground"
+            aria-label="Home"
+          >
+            <Home className="h-4 w-4" />
+          </Link>
+        </li>
+        {items.map((item, index) => (
+          <li key={index} className="flex items-center">
+            <ChevronRight className="h-4 w-4 mx-1" aria-hidden="true" />
+            {item.href ? (
+              <Link
+                href={item.href}
+                className={cn(
+                  "hover:text-foreground transition-colors",
+                  item.className,
+                )}
+              >
+                {item.label}
+              </Link>
+            ) : (
+              <span
+                className={cn("font-medium text-foreground", item.className)}
+              >
+                {item.label}
+              </span>
+            )}
+          </li>
+        ))}
+      </ol>
+    </nav>
+  );
+}
diff --git a/apps/web/src/components/CompaniesList.tsx b/apps/web/src/components/CompaniesList.tsx
index 58f0c83..b2bd099 100644
--- a/apps/web/src/components/CompaniesList.tsx
+++ b/apps/web/src/components/CompaniesList.tsx
@@ -13,16 +13,20 @@ import { useSearchQueryParams } from "./hooks/useSearchQueryParams";
 
 const PAGE_SIZE = 15;
 
+type CompaniesListProps = {
+  allCompanies: Company[];
+  updatedAtISODate: string;
+  allowSearchParams?: boolean;
+};
+
 export default function CompaniesList({
   allCompanies,
   updatedAtISODate,
-}: {
-  allCompanies: Company[];
-  updatedAtISODate: string;
-}) {
+  allowSearchParams = true,
+}: CompaniesListProps) {
   const {
     searchParams: { query, category, location, page },
-  } = useSearchQueryParams();
+  } = useSearchQueryParams(allowSearchParams);
 
   const start = (page - 1) * PAGE_SIZE;
   const end = start + PAGE_SIZE;
@@ -42,16 +46,13 @@ export default function CompaniesList({
     <>
       {!paginatedCompanies.length ? (
         <motion.div
-          className="flex-1 font-mono"
+          className="flex-1 font-mono flex items-center justify-center"
           initial={{ opacity: 0, scale: 0.95 }}
           animate={{ opacity: 1, scale: 1 }}
           transition={{ duration: 0.3 }}
           aria-label="No companies found"
         >
-          <EmptyState
-            title="No companies found"
-            description="We couldn't find any companies matching your search."
-          />
+          <EmptyState title="No companies found" />
         </motion.div>
       ) : (
         <div className="flex-1 font-mono" aria-label="Companies list">
@@ -75,7 +76,7 @@ export default function CompaniesList({
                 animate={{ opacity: 1, y: 0 }}
                 transition={{
                   duration: 0.3,
-                  delay: index * 0.05,
+                  // delay: index * 0.05,
                   ease: "easeOut",
                 }}
                 aria-label={`Company ${company.name}`}
diff --git a/apps/web/src/components/CompaniesListFooter.tsx b/apps/web/src/components/CompaniesListFooter.tsx
index a82ce5b..b459139 100644
--- a/apps/web/src/components/CompaniesListFooter.tsx
+++ b/apps/web/src/components/CompaniesListFooter.tsx
@@ -29,7 +29,7 @@ export default function CompaniesListFooter({
       className="flex items-center justify-between gap-2"
       data-testid="companies-list-footer"
     >
-      <div className="flex basis-1/2 justify-end text-sm text-muted-foreground h-9">
+      <div className="flex basis-1/2 justify-end text-sm text-muted-foreground h-8">
         <Badge variant="outline" className="rounded-none bg-white px-1 gap-1">
           Page {currentPage} of {totalPages}
         </Badge>
@@ -38,7 +38,7 @@ export default function CompaniesListFooter({
         <Button
           className={cn(
             isPreviousDisabled && "pointer-events-none text-muted-foreground",
-            "!px-2",
+            "!px-2 h-8",
           )}
           variant="outline"
           size="sm"
@@ -49,7 +49,7 @@ export default function CompaniesListFooter({
         <Button
           className={cn(
             isPreviousDisabled && "pointer-events-none text-muted-foreground",
-            "!px-2",
+            "!px-2 h-8",
           )}
           variant="outline"
           size="sm"
@@ -62,7 +62,7 @@ export default function CompaniesListFooter({
           size="sm"
           className={cn(
             isNextDisabled && "pointer-events-none text-muted-foreground",
-            "!px-2",
+            "!px-2 h-8",
           )}
           onClick={() => setSearchParams({ page: currentPage + 1 })}
         >
@@ -73,7 +73,7 @@ export default function CompaniesListFooter({
           size="sm"
           className={cn(
             isNextDisabled && "pointer-events-none text-muted-foreground",
-            "!px-2",
+            "!px-2 h-8",
           )}
           onClick={() => setSearchParams({ page: totalPages })}
         >
diff --git a/apps/web/src/components/CompaniesListHeader.tsx b/apps/web/src/components/CompaniesListHeader.tsx
index b37e98d..ee87744 100644
--- a/apps/web/src/components/CompaniesListHeader.tsx
+++ b/apps/web/src/components/CompaniesListHeader.tsx
@@ -34,14 +34,14 @@ export const CompaniesListHeader = ({
     <>
       <Badge
         variant="outline"
-        className="rounded-none bg-white px-1 gap-1 h-6 whitespace-nowrap"
+        className="rounded-none bg-white px-1 gap-1 h-8 whitespace-nowrap"
       >
         <Clock size={14} />
-        {formatDistanceToNow(new Date(updatedAtISODate))} ago
+        Synced {formatDistanceToNow(new Date(updatedAtISODate))} ago
       </Badge>
       <Badge
         variant="outline"
-        className="rounded-none bg-white px-1 flex items-center justify-center h-6 whitespace-nowrap"
+        className="rounded-none bg-white px-1 flex items-center justify-center h-8 whitespace-nowrap"
       >
         Page {currentPage} of {totalPages}
         <span className="hidden md:inline-block">
diff --git a/apps/web/src/components/ExploreButton.tsx b/apps/web/src/components/ExploreButton.tsx
index dd97a2f..5ac90e1 100644
--- a/apps/web/src/components/ExploreButton.tsx
+++ b/apps/web/src/components/ExploreButton.tsx
@@ -7,7 +7,8 @@ import { Button } from "./ui/button";
 
 export default function ExploreButton() {
   const segment = useSelectedLayoutSegment();
-  const isCompanyPage = segment === "company";
+  const isCompanyPage =
+    segment === "company" || segment === "location" || segment === "category";
 
   if (!isCompanyPage) {
     return null;
@@ -21,7 +22,7 @@ export default function ExploreButton() {
     >
       <Link href="/">
         <ArrowLeft className="mr-2 shrink-0" aria-hidden="true" size={16} />
-        Back to Companies
+        Back to all companies
       </Link>
     </Button>
   );
diff --git a/apps/web/src/components/FiltersPanelButton.tsx b/apps/web/src/components/FiltersPanelButton.tsx
index 95f892e..8e0f9d7 100644
--- a/apps/web/src/components/FiltersPanelButton.tsx
+++ b/apps/web/src/components/FiltersPanelButton.tsx
@@ -70,6 +70,7 @@ export default function FiltersPanelButton({
                 onReset={() => {
                   setIsFilterOpen(false);
                 }}
+                showCountBadge={false}
                 extendedUI={() => (
                   <>
                     <Button
diff --git a/apps/web/src/components/Footer.tsx b/apps/web/src/components/Footer.tsx
index f5d5d18..8a692f6 100644
--- a/apps/web/src/components/Footer.tsx
+++ b/apps/web/src/components/Footer.tsx
@@ -1,19 +1,87 @@
-export default function Footer() {
+import { getParsedCompaniesData } from "@/lib/parser/companies";
+import { HotFeaturedBadge } from "./HotFeaturedBadge";
+import { LogoFooter } from "./LogoFooter";
+
+export default async function Footer() {
+  const { availableLocations, availableCategories } =
+    await getParsedCompaniesData();
+
   return (
-    <footer className="bg-background py-4 text-center text-xs">
-      <div className="container">
-        <p className="text-muted-foreground">
-          Crafted with ❤️ by{" "}
-          <a
-            href="https://alexandremarques.io"
-            target="_blank"
-            rel="noopener"
-            className="underline underline-offset-[2px]"
-          >
-            Alexandre Marques
-          </a>
-        </p>
+    <footer className="bg-background font-mono">
+      <div className="container flex flex-col gap-4 p-6">
+        <div className="w-full flex flex-col md:flex-row md:justify-between items-center flex-wrap gap-4">
+          <LogoFooter />
+          <p className="text-xs text-center">
+            Crafted by{" "}
+            <a
+              href="https://alexandremarques.io"
+              target="_blank"
+              rel="noopener"
+              className="underline underline-offset-[2px]"
+            >
+              Alexandre Marques
+            </a>{" "}
+            <span>&copy; {new Date().getFullYear()}</span>
+          </p>
+        </div>
+        <div className="grid grid-cols-1 gap-8 sm:grid-cols-2 border-t border-border pt-6">
+          <div className="flex flex-col gap-5">
+            <h3
+              aria-label="Companies by Location"
+              className="text-sm font-semibold"
+            >
+              Companies by Location
+            </h3>
+            <div className="grid grid-cols-2 gap-2">
+              {availableLocations.map((location) => (
+                <a
+                  key={location}
+                  target="_blank"
+                  aria-label={`Companies in ${location}`}
+                  href={`/location/${encodeURIComponent(location)}`}
+                  className="text-xs hover:underline"
+                >
+                  {getCompanyLocationLabel(location)}
+                </a>
+              ))}
+            </div>
+          </div>
+
+          <div className="flex flex-col gap-5">
+            <h3
+              aria-label="Companies by Category"
+              className="text-sm font-semibold"
+            >
+              Companies by Category
+            </h3>
+            <div className="grid grid-cols-2 gap-2">
+              {availableCategories.map((category) => (
+                <a
+                  key={category}
+                  target="_blank"
+                  aria-label={`${category} companies`}
+                  href={`/category/${encodeURIComponent(category)}`}
+                  className="text-xs hover:underline"
+                >
+                  {category}
+                </a>
+              ))}
+            </div>
+          </div>
+        </div>
       </div>
     </footer>
   );
 }
+
+const getCompanyLocationLabel = (location: string) => {
+  if (location.toLowerCase() === "remote") {
+    return (
+      <div className="inline-flex gap-2">
+        <span>{location}</span>
+        <HotFeaturedBadge className="text-[9px]" />
+      </div>
+    );
+  }
+  return location;
+};
diff --git a/apps/web/src/components/HotFeaturedBadge.tsx b/apps/web/src/components/HotFeaturedBadge.tsx
index 7ab208e..83a91b6 100644
--- a/apps/web/src/components/HotFeaturedBadge.tsx
+++ b/apps/web/src/components/HotFeaturedBadge.tsx
@@ -1,7 +1,16 @@
-export const HotFeaturedBadge = () => {
+import { cn } from "@/lib/utils";
+
+type HotFeaturedBadgeProps = {
+  className?: string;
+};
+
+export const HotFeaturedBadge = ({ className }: HotFeaturedBadgeProps) => {
   return (
     <span
-      className="inline-flex items-center rounded-md bg-red-500/90 px-[2px] text-xs font-sans font-bold text-white shadow-sm"
+      className={cn(
+        "inline-flex items-center rounded-md bg-red-500/90 px-[2px] text-xs font-sans font-bold text-white shadow-sm",
+        className,
+      )}
       aria-label="Hot feature badge"
     >
       HOT{" "}
diff --git a/apps/web/src/components/LogoFooter.tsx b/apps/web/src/components/LogoFooter.tsx
new file mode 100644
index 0000000..643fe96
--- /dev/null
+++ b/apps/web/src/components/LogoFooter.tsx
@@ -0,0 +1,26 @@
+import Image from "next/image";
+import logo from "../../public/assets/images/logo.png";
+
+export const LogoFooter = () => {
+  return (
+    <div className="flex items-center gap-3 flex-wrap justify-center">
+      <div className="inline-flex items-center gap-1">
+        <Image
+          src={logo}
+          alt="Tech Companies Portugal Logo"
+          width={35}
+          height={35}
+          className="shrink-0"
+        />
+        <span className="text-xs font-semibold">techcompaniesportugal.fyi</span>
+      </div>
+      <a href="https://techcompaniesportugal.openstatus.dev" target="_blank">
+        <img
+          className="h-5"
+          src="https://openstatus.dev/status-page/techcompaniesportugal/badge?size=sm&theme=light"
+          alt="OpenStatus Badge"
+        />
+      </a>
+    </div>
+  );
+};
diff --git a/apps/web/src/components/Navbar.tsx b/apps/web/src/components/Navbar.tsx
index b6b3d8d..1651c5f 100644
--- a/apps/web/src/components/Navbar.tsx
+++ b/apps/web/src/components/Navbar.tsx
@@ -2,6 +2,7 @@ import { getParsedCompaniesCategoriesAndLocations } from "@/lib/parser/companies
 import Image from "next/image";
 import Link from "next/link";
 import { Suspense } from "react";
+import logo from "../../public/assets/images/logo.png";
 import ExploreButton from "./ExploreButton";
 import FiltersPanelButton from "./FiltersPanelButton";
 import { Button } from "./ui/button";
@@ -20,7 +21,7 @@ export default function Navbar() {
           aria-label="Tech Companies Portugal - Home"
         >
           <Image
-            src="/assets/images/logo.png"
+            src={logo}
             priority
             alt="Tech companies in Portugal Logo"
             width="40"
@@ -45,7 +46,7 @@ export default function Navbar() {
           role="navigation"
           aria-label="Main navigation"
         >
-          <Suspense>
+          <Suspense fallback={""}>
             <FiltersPanelButton
               companiesCategoriesAndLocationsPromise={getParsedCompaniesCategoriesAndLocations()}
             />
diff --git a/apps/web/src/components/SearchSideBar.tsx b/apps/web/src/components/SearchSideBar.tsx
index 58fec29..8000189 100644
--- a/apps/web/src/components/SearchSideBar.tsx
+++ b/apps/web/src/components/SearchSideBar.tsx
@@ -15,12 +15,14 @@ import {
 } from "./ui/select";
 
 import { useSearchQueryParams } from "./hooks/useSearchQueryParams";
+import { Badge } from "./ui/badge";
 
 type SearchSideBarProps = {
   locationOptions: string[];
   categoryOptions: string[];
   extendedUI?: () => React.ReactNode;
   onReset?: () => void;
+  showCountBadge?: boolean;
 };
 
 export function SearchSideBar({
@@ -28,6 +30,7 @@ export function SearchSideBar({
   categoryOptions,
   extendedUI,
   onReset,
+  showCountBadge = true,
 }: SearchSideBarProps) {
   const { setSearchParams, searchParams, appliedFilters } =
     useSearchQueryParams();
@@ -39,8 +42,18 @@ export function SearchSideBar({
     >
       <RetroContainer
         variant="static"
-        className="shrink-0 md:w-[290px] md:mx-auto"
+        className="shrink-0 md:w-[290px] md:mx-auto relative"
       >
+        {showCountBadge && (
+          <div className="absolute top-0 right-0 text-xs p-1">
+            {appliedFilters.length > 0 && (
+              <Badge className="text-xs px-2 m-0">
+                {appliedFilters.length}
+              </Badge>
+            )}
+          </div>
+        )}
+
         <form
           className="px-4 py-3 w-full"
           aria-label="Search form"
@@ -114,9 +127,9 @@ export function SearchSideBar({
 
               <Button
                 type="button"
-                variant="outline"
+                variant="secondary"
                 disabled={appliedFilters.length === 0}
-                className="h-9 w-full px-2 border-destructive text-destructive hover:bg-destructive/10 hover:text-destructive"
+                className="h-9 w-full px-2"
                 onClick={() => {
                   setSearchParams(null);
                   onReset?.();
diff --git a/apps/web/src/components/SimpleFooter.tsx b/apps/web/src/components/SimpleFooter.tsx
new file mode 100644
index 0000000..55251c6
--- /dev/null
+++ b/apps/web/src/components/SimpleFooter.tsx
@@ -0,0 +1,25 @@
+import { LogoFooter } from "./LogoFooter";
+
+export default function SimpleFooter() {
+  return (
+    <footer className="bg-background font-mono">
+      <div className="container flex flex-col gap-4 p-3">
+        <div className="w-full flex flex-col md:flex-row md:justify-between items-center flex-wrap gap-4">
+          <LogoFooter />
+          <p className="text-xs text-center">
+            Crafted by{" "}
+            <a
+              href="https://alexandremarques.io"
+              target="_blank"
+              rel="noopener"
+              className="underline underline-offset-[2px]"
+            >
+              Alexandre Marques
+            </a>{" "}
+            <span>&copy; {new Date().getFullYear()}</span>
+          </p>
+        </div>
+      </div>
+    </footer>
+  );
+}
diff --git a/apps/web/src/components/hooks/useSearchQueryParams.tsx b/apps/web/src/components/hooks/useSearchQueryParams.tsx
index 145af9a..e025792 100644
--- a/apps/web/src/components/hooks/useSearchQueryParams.tsx
+++ b/apps/web/src/components/hooks/useSearchQueryParams.tsx
@@ -1,8 +1,11 @@
-import { searchParamsQueryStateKeys } from "@/lib/search-params";
+import {
+  defaultSearchParams,
+  searchParamsQueryStateKeys,
+} from "@/lib/search-params";
 import { useQueryStates } from "nuqs";
 import { useMemo } from "react";
 
-export const useSearchQueryParams = () => {
+export const useSearchQueryParams = (enabled = true) => {
   const [searchParams, setSearchParams] = useQueryStates(
     searchParamsQueryStateKeys,
     {
@@ -12,11 +15,17 @@ export const useSearchQueryParams = () => {
 
   const appliedFilters = useMemo(
     () =>
-      Object.entries(searchParams).filter(
-        ([key, value]) => key != "page" && !!value,
-      ),
-    [searchParams],
+      enabled
+        ? Object.entries(searchParams).filter(
+            ([key, value]) => key != "page" && !!value,
+          )
+        : [],
+    [searchParams, enabled],
   );
 
-  return { searchParams, setSearchParams, appliedFilters };
+  return {
+    searchParams: enabled ? searchParams : defaultSearchParams,
+    setSearchParams: enabled ? setSearchParams : () => {},
+    appliedFilters,
+  };
 };
diff --git a/apps/web/src/lib/search-params.ts b/apps/web/src/lib/search-params.ts
index a448709..4b967a2 100644
--- a/apps/web/src/lib/search-params.ts
+++ b/apps/web/src/lib/search-params.ts
@@ -5,12 +5,19 @@ import {
   parseAsString,
 } from "nuqs/server";
 
+export const defaultSearchParams = {
+  query: "",
+  category: "",
+  location: "",
+  page: 1,
+};
+
 // can be used in the client as well
 export const searchParamsQueryStateKeys = {
-  query: parseAsString.withDefault(""),
-  category: parseAsString.withDefault(""),
-  location: parseAsString.withDefault(""),
-  page: parseAsFloat.withDefault(1),
+  query: parseAsString.withDefault(defaultSearchParams.query),
+  category: parseAsString.withDefault(defaultSearchParams.category),
+  location: parseAsString.withDefault(defaultSearchParams.location),
+  page: parseAsFloat.withDefault(defaultSearchParams.page),
 };
 
 // for server side
diff --git a/apps/web/src/lib/types.ts b/apps/web/src/lib/types.ts
index b77d4d8..5026dd9 100644
--- a/apps/web/src/lib/types.ts
+++ b/apps/web/src/lib/types.ts
@@ -25,4 +25,4 @@ export type PageViewsData = {
   views: Record<string, number>;
 }[];
 
-export type NextParams = Promise<{ slug: string }>;
+export type NextParams<T> = Promise<T>;
diff --git a/package.json b/package.json
index 0e9e9a0..781e866 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
   "name": "tech-companies-portugal",
   "private": true,
   "author": "Alexandre Marques",
-  "workspaces": [
-    "apps/*",
-    "tooling/*",
-    "packages/*"
-  ],
+  "workspaces": ["apps/*", "tooling/*", "packages/*"],
   "description": "Monorepo for the Tech Companies in Portugal",
   "scripts": {
     "build": "turbo build",
@@ -29,4 +25,4 @@
     "turbo": "2.3.3"
   },
   "packageManager": "npm@10.9.0"
-}
\ No newline at end of file
+}
diff --git a/tooling/tailwind/package.json b/tooling/tailwind/package.json
index 4cb7ab0..5bca649 100644
--- a/tooling/tailwind/package.json
+++ b/tooling/tailwind/package.json
@@ -13,4 +13,4 @@
   "exports": {
     ".": "./tailwind.config.ts"
   }
-}
\ No newline at end of file
+}
diff --git a/tooling/typescript/nextjs.json b/tooling/typescript/nextjs.json
index 258a1a8..18bb85a 100644
--- a/tooling/typescript/nextjs.json
+++ b/tooling/typescript/nextjs.json
@@ -14,4 +14,4 @@
     "jsx": "preserve",
     "noEmit": true
   }
-}
\ No newline at end of file
+}
diff --git a/tooling/typescript/package.json b/tooling/typescript/package.json
index 7c735a2..3eb4d89 100644
--- a/tooling/typescript/package.json
+++ b/tooling/typescript/package.json
@@ -6,10 +6,5 @@
     "clean": "git clean -xdf .turbo",
     "lint": "biome check . --write"
   },
-  "files": [
-    "base.json",
-    "react-lib.json",
-    "nextjs.json",
-    "tsup.config.json"
-  ]
-}
\ No newline at end of file
+  "files": ["base.json", "react-lib.json", "nextjs.json", "tsup.config.json"]
+}
diff --git a/tooling/typescript/tsup.config.json b/tooling/typescript/tsup.config.json
index 412c9d5..290dc84 100644
--- a/tooling/typescript/tsup.config.json
+++ b/tooling/typescript/tsup.config.json
@@ -1,14 +1,9 @@
 {
-  "entry": [
-    "index.ts"
-  ],
-  "format": [
-    "cjs",
-    "esm"
-  ],
+  "entry": ["index.ts"],
+  "format": ["cjs", "esm"],
   "dts": true,
   "splitting": false,
   "sourcemap": false,
   "clean": true,
   "minify": true
-}
\ No newline at end of file
+}
diff --git a/turbo.json b/turbo.json
index e81855e..cecde55 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,25 +1,15 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "globalDependencies": [
-    "**/.env"
-  ],
+  "globalDependencies": ["**/.env"],
   "ui": "stream",
   "tasks": {
     "transit": {
-      "dependsOn": [
-        "^transit"
-      ]
+      "dependsOn": ["^transit"]
     },
     "build": {
-      "dependsOn": [
-        "^build"
-      ],
+      "dependsOn": ["^build"],
       "env": [],
-      "inputs": [
-        "$TURBO_DEFAULT$",
-        ".env*",
-        "!tests/**"
-      ],
+      "inputs": ["$TURBO_DEFAULT$", ".env*", "!tests/**"],
       "outputs": [
         ".next/**",
         "!.next/cache/**",
@@ -28,23 +18,15 @@
       ]
     },
     "check-types": {
-      "dependsOn": [
-        "^transit"
-      ]
+      "dependsOn": ["^transit"]
     },
     "test": {},
     "test:e2e": {
-      "passThroughEnv": [
-        "PLAYWRIGHT_*"
-      ]
+      "passThroughEnv": ["PLAYWRIGHT_*"]
     },
     "@tech-companies-portugal/web#test:e2e": {
-      "passThroughEnv": [
-        "PLAYWRIGHT_*"
-      ],
-      "dependsOn": [
-        "build"
-      ]
+      "passThroughEnv": ["PLAYWRIGHT_*"],
+      "dependsOn": ["build"]
     },
     "test:watch": {
       "cache": false,
@@ -57,17 +39,12 @@
       "cache": false
     },
     "lint": {
-      "dependsOn": [
-        "^transit"
-      ]
+      "dependsOn": ["^transit"]
     },
     "dev": {
       "persistent": true,
       "cache": false,
-      "inputs": [
-        "$TURBO_DEFAULT$",
-        ".env*"
-      ]
+      "inputs": ["$TURBO_DEFAULT$", ".env*"]
     }
   }
-}
\ No newline at end of file
+}