diff --git a/studio/web/app/home/organisations/[organisationId]/edit/page.tsx b/studio/web/app/home/organisations/[organisationId]/edit/page.tsx
index f3e2343..2b8a7b1 100644
--- a/studio/web/app/home/organisations/[organisationId]/edit/page.tsx
+++ b/studio/web/app/home/organisations/[organisationId]/edit/page.tsx
@@ -127,16 +127,6 @@ export default function Page({ params: { organisationId } }: OrgaisationParam) {
               <Image src={UploadImage} alt="logo" width={125} height={125} />
             </div>
           </div>
-        </form>
-        <div className="flex gap-3">
-          <Link href="/home/organisations">
-            <Button
-              variant="outline"
-              className="rounded-md text-[#376789] border-[#376789]"
-            >
-              Cancel
-            </Button>
-          </Link>
           <Button
             onClick={handleSubmit(async (data) => {
               try {
@@ -161,10 +151,20 @@ export default function Page({ params: { organisationId } }: OrgaisationParam) {
                 toast.error("Something went wrong");
               }
             })}
-            className="rounded-md bg-[#376789] text-white"
+            className="rounded-md bg-[#376789] text-white w-full"
           >
             Edit Organisation
           </Button>
+        </form>
+        <div className="flex gap-3">
+          <Link href="/home/organisations">
+            <Button
+              variant="outline"
+              className="rounded-md text-[#376789] border-[#376789]"
+            >
+              Cancel
+            </Button>
+          </Link>
         </div>
       </div>
     </main>
diff --git a/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/dataset/new/page.tsx b/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/dataset/new/page.tsx
index 0074cdf..67d3eab 100644
--- a/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/dataset/new/page.tsx
+++ b/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/dataset/new/page.tsx
@@ -1,9 +1,10 @@
 "use client";
-import React, { useState } from "react";
+import React, { useRef, useState } from "react";
 import { Button } from "@/components/ui/Button";
 import { Input } from "@/components/dataEntry/input";
 import { Label } from "@/components/dataEntry/label";
 import Link from "next/link";
+import Image from "next/image";
 import { ProjectParam } from "@/types/params/project_param";
 import { CreateFileSchema, createFileSchema } from "@/lib/zod/validators/files";
 import axios, { AxiosError } from "axios";
@@ -14,6 +15,10 @@ import { useRouter } from "next/navigation";
 import UppyUploader from "@/components/UppyUploader";
 import { getServerUrl } from "@/lib/utils/serverUrl";
 import { kavachAxiosConfig } from "@/lib/utils/kavachAxiosConfig";
+import UploadImage from "@/assets/uploadImage.png";
+import FileImage from "@/assets/document.png";
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
+import { title } from "process";
 
 export default function Page({
   params: { projectId, organisationId },
@@ -21,12 +26,19 @@ export default function Page({
   const {
     handleSubmit,
     register,
-    formState: { errors },
+    formState,
+    getValues
   } = useForm<CreateFileSchema>({
     resolver: zodResolver(createFileSchema),
   });
+  const [title, setTitle] = useState<string>("");
   const [filename, setFilename] = useState<string>("");
+  const [uploadDialogOpen, setUploadDialogOpen] = useState<boolean>(false)
   const router = useRouter();
+  const {errors} = formState
+
+  const diableAddButton = filename === '' || title === ''
+  
   return (
     <main className="flex flex-col mt-10 bg-transparent">
       <div className="flex flex-row justify-around items-start">
@@ -41,6 +53,7 @@ export default function Page({
               id="title"
               {...register("name")}
               placeholder="Enter the title"
+              onChange={(e) => setTitle(e.target.value)}
             />
             {errors.name ? (
               <div className="text-red-500 italic  text-xs">
@@ -50,28 +63,35 @@ export default function Page({
               ""
             )}
           </div>
-          <div>
-            <UppyUploader
-              onUpload={(_, path) => {
-                setFilename(path);
-              }}
-              isDataset={true}
-            />
+          <div className="grid w-full items-center gap-3">
+            <Label htmlFor="title" className="font-normal">
+              Upload Dataset
+            </Label>
+            <Dialog open={uploadDialogOpen} onOpenChange={setUploadDialogOpen}>
+              <DialogTrigger asChild>
+                <div className="p-6 border border-input rounded-md w-fit cursor-pointer">
+                  <Image
+                    src={filename !== '' ? FileImage : UploadImage}
+                    alt="logo"
+                    width={125}
+                    height={125}
+                  />
+                  {filename}
+                </div>
+              </DialogTrigger>
+              <DialogContent className="w-fit max-w-4xl">
+                <UppyUploader
+                  onUpload={(_, path) => {
+                    setFilename(path);
+                    setUploadDialogOpen(false);
+                  }}
+                  isDataset={true}
+                />
+              </DialogContent>
+            </Dialog>
           </div>
-        </form>
-        <div className="flex gap-3">
-          <Button
-            variant="outline"
-            className="rounded-md text-[#376789] border-[#376789]"
-            asChild
-          >
-            <Link
-              href={`/home/organisations/${organisationId}/projects/${projectId}/`}
-            >
-              Cancel
-            </Link>
-          </Button>
           <Button
+            disabled={diableAddButton || false}
             onClick={handleSubmit(async (data) => {
               const file = {
                 name: data.name.trim(),
@@ -101,10 +121,23 @@ export default function Page({
                 toast.error("Something went wrong");
               }
             })}
-            className="rounded-md bg-[#376789] text-white"
+            className="rounded-md bg-[#376789] text-white w-full"
           >
             Add Dataset
           </Button>
+        </form>
+        <div className="flex gap-3">
+          <Button
+            variant="outline"
+            className="rounded-md text-[#376789] border-[#376789]"
+            asChild
+          >
+            <Link
+              href={`/home/organisations/${organisationId}/projects/${projectId}/`}
+            >
+              Cancel
+            </Link>
+          </Button>
         </div>
       </div>
     </main>
diff --git a/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/edit/page.tsx b/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/edit/page.tsx
index 90800c5..e341ca5 100644
--- a/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/edit/page.tsx
+++ b/studio/web/app/home/organisations/[organisationId]/projects/[projectId]/edit/page.tsx
@@ -4,14 +4,6 @@ import { Button } from "@/components/ui/Button";
 import { Input } from "@/components/dataEntry/input";
 import { Label } from "@/components/dataEntry/label";
 import { Textarea } from "@/components/dataEntry/textarea";
-import {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
 import Link from "next/link";
 import { useForm } from "react-hook-form";
 import { useOrganisationsStore } from "@/lib/zustand/organisation";
@@ -39,6 +31,7 @@ export default function Page({
     register,
     formState: { errors },
     setValue,
+    watch,
   } = useForm<CreateProjectSchema>({
     resolver: zodResolver(createProjectSchema),
   });
@@ -94,46 +87,15 @@ export default function Page({
     );
   }
 
-  const currentOrganisation = organisations.find(
-    (org) => parseInt(org.id) === parseInt(orgId),
-  );
+  const titleValue = watch("title");
+
+  const disableButton = titleValue === undefined || titleValue === "";``
 
   return (
     <main className="flex flex-col mt-10 bg-transparent">
       <div className="flex flex-row justify-around items-start">
         <h1 className="text-xl font-semibold">Edit {project.title}</h1>
         <form className="flex flex-col items-center w-2/5 mt-20 gap-10">
-          <div className="grid w-full items-center gap-3">
-            <Label htmlFor="organisation" className="font-normal">
-              Organisation
-            </Label>
-            <Select
-              onValueChange={(value) => {
-                organisations.map((org) => {
-                  if (org.title === value) {
-                    newOrgId = org.id;
-                  }
-                });
-              }}
-            >
-              <SelectTrigger className="w-full">
-                <SelectValue
-                  placeholder={currentOrganisation?.title}
-                ></SelectValue>
-              </SelectTrigger>
-              <SelectContent>
-                <SelectGroup>
-                  {organisations.map((org) => {
-                    return (
-                      <SelectItem key={org.id} value={org.title}>
-                        {org.title}
-                      </SelectItem>
-                    );
-                  })}
-                </SelectGroup>
-              </SelectContent>
-            </Select>
-          </div>
           <div className="grid w-full items-center gap-3">
             <Label htmlFor="title" className="font-normal">
               Title
@@ -165,16 +127,8 @@ export default function Page({
               </p>
             )}
           </div>
-        </form>
-        <div className="flex gap-3">
-          <Button
-            variant="outline"
-            className="rounded-md text-[#376789] border-[#376789]"
-            asChild
-          >
-            <Link href={`/home/organisations/${orgId}`}>Cancel</Link>
-          </Button>
           <Button
+            disabled={disableButton}
             onClick={handleSubmit(async (data) => {
               if (newOrgId !== orgId) {
                 try {
@@ -218,10 +172,19 @@ export default function Page({
                 toast.error("Something went wrong");
               }
             })}
-            className="rounded-md bg-[#376789] text-white"
+            className="rounded-md bg-[#376789] text-white w-full"
           >
             Edit Project
           </Button>
+        </form>
+        <div className="flex gap-3">
+          <Button
+            variant="outline"
+            className="rounded-md text-[#376789] border-[#376789]"
+            asChild
+          >
+            <Link href={`/home/organisations/${orgId}`}>Cancel</Link>
+          </Button>
         </div>
       </div>
     </main>
diff --git a/studio/web/app/home/organisations/[organisationId]/projects/new/page.tsx b/studio/web/app/home/organisations/[organisationId]/projects/new/page.tsx
index 3f06614..0172c3d 100644
--- a/studio/web/app/home/organisations/[organisationId]/projects/new/page.tsx
+++ b/studio/web/app/home/organisations/[organisationId]/projects/new/page.tsx
@@ -4,14 +4,6 @@ import { Button } from "@/components/ui/Button";
 import { Input } from "@/components/dataEntry/input";
 import { Label } from "@/components/dataEntry/label";
 import { Textarea } from "@/components/dataEntry/textarea";
-import {
-	Select,
-	SelectContent,
-	SelectGroup,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
 import Link from "next/link";
 import { useForm } from "react-hook-form";
 import { useOrganisationsStore } from "@/lib/zustand/organisation";
@@ -38,6 +30,7 @@ export default function Page({
 		handleSubmit,
 		register,
 		formState: { errors },
+		watch
 	} = useForm<CreateProjectSchema>({
 		resolver: zodResolver(createProjectSchema),
 	});
@@ -60,40 +53,14 @@ export default function Page({
 		getOrganisations();
 	}, []);
 
+	const watchTitle = watch("title");
+	const disableButton = watchTitle === undefined || watchTitle === "" || orgId === undefined || orgId === "";
+
 	return (
 		<main className="flex flex-col mt-10 bg-transparent">
 			<div className="flex flex-row justify-around items-start">
 				<h1 className="text-xl font-semibold">Create New Project </h1>
 				<form className="flex flex-col items-center w-2/5 mt-20 gap-10">
-					<div className="grid w-full items-center gap-3">
-						<Label htmlFor="organisation" className="font-normal">
-							Organisation
-						</Label>
-						<Select
-							onValueChange={(value) => {
-								organisations.map((org) => {
-									if (org.title === value) {
-										orgId = org.id;
-									}
-								});
-							}}
-						>
-							<SelectTrigger className="w-full">
-								<SelectValue placeholder={"Select Organisation"}></SelectValue>
-							</SelectTrigger>
-							<SelectContent>
-								<SelectGroup>
-									{organisations.map((org) => {
-										return (
-											<SelectItem key={org.id} value={org.title}>
-												{org.title}
-											</SelectItem>
-										);
-									})}
-								</SelectGroup>
-							</SelectContent>
-						</Select>
-					</div>
 					<div className="grid w-full items-center gap-3">
 						<Label htmlFor="title" className="font-normal">
 							Title
@@ -125,16 +92,8 @@ export default function Page({
 							</p>
 						)}
 					</div>
-				</form>
-				<div className="flex gap-3">
-					<Button
-						variant="outline"
-						className="rounded-md text-[#376789] border-[#376789]"
-						asChild
-					>
-						<Link href={`/home/organisations/${orgId}`}>Cancel</Link>
-					</Button>
 					<Button
+						disabled={disableButton}
 						onClick={handleSubmit(async (data) => {
 							try {
 								await axios.post(
@@ -156,10 +115,19 @@ export default function Page({
 								toast.error("Something went wrong");
 							}
 						})}
-						className="rounded-md bg-[#376789] text-white"
+						className="rounded-md bg-[#376789] text-white w-full"
 					>
 						Create Project
 					</Button>
+				</form>
+				<div className="flex gap-3">
+					<Button
+						variant="outline"
+						className="rounded-md text-[#376789] border-[#376789]"
+						asChild
+					>
+						<Link href={`/home/organisations/${orgId}`}>Cancel</Link>
+					</Button>
 				</div>
 			</div>
 		</main>
diff --git a/studio/web/app/home/organisations/new/page.tsx b/studio/web/app/home/organisations/new/page.tsx
index bed1f8b..c4821d1 100644
--- a/studio/web/app/home/organisations/new/page.tsx
+++ b/studio/web/app/home/organisations/new/page.tsx
@@ -114,16 +114,6 @@ export default function Page() {
               </DialogContent>
             </Dialog>
           </div>
-        </form>
-        <div className="flex gap-3">
-          <Link href="/home/organisations">
-            <Button
-              variant="outline"
-              className="rounded-md text-[#376789] border-[#376789]"
-            >
-              Cancel
-            </Button>
-          </Link>
           <Button
             onClick={handleSubmit(async (data) => {
               try {
@@ -144,10 +134,20 @@ export default function Page() {
                 toast.error("Something went wrong");
               }
             })}
-            className="rounded-md bg-[#376789] text-white"
+            className="rounded-md bg-[#376789] text-white self-start w-full"
           >
             Create Organization
           </Button>
+        </form>
+        <div className="flex gap-3">
+          <Link href="/home/organisations">
+            <Button
+              variant="outline"
+              className="rounded-md text-[#376789] border-[#376789]"
+            >
+              Cancel
+            </Button>
+          </Link>
         </div>
       </div>
     </main>
diff --git a/studio/web/app/home/organisations/page.tsx b/studio/web/app/home/organisations/page.tsx
index 8570dd4..8e7109f 100644
--- a/studio/web/app/home/organisations/page.tsx
+++ b/studio/web/app/home/organisations/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 import React, { useEffect } from "react";
+import { useRouter } from "next/navigation";
 import { SearchBar } from "@/components/ui/searchBar";
 import { Organisation } from "../../../components/ui/Organisation";
 import { Organisation as OrganisationType } from "@/types/organisation";
@@ -17,6 +18,7 @@ export default function Page() {
 	const [loading, setLoading] = React.useState(true);
 	const { organisations, setOrganisations } = useOrganisationsStore();
 	const serverUrl = getServerUrl();
+	const router = useRouter();
 
 	useEffect(() => {
 		async function getOrganisations() {
@@ -29,6 +31,10 @@ export default function Page() {
 					...kavachAxiosConfig,
 				});
 				setOrganisations(resp.data.organisations);
+				if (resp.data.organisations.length === 0) {
+					router.push("/home/organisations/new");
+					toast.error("No organisations found. Create a new one");
+				}
 			} catch (err) {
 				console.log(err);
 				toast.error("Error getting organisations");
@@ -36,7 +42,7 @@ export default function Page() {
 				setLoading(false);
 			}
 		}
-		getOrganisations();
+		getOrganisations()
 	}, []);
 	const [selectedOrg, setSelectedOrg] = React.useState<string | null>(null);
 
@@ -57,6 +63,8 @@ export default function Page() {
 		}
 	};
 
+
+
 	return (
 		<main className="flex flex-col mt-10 bg-transparent">
 			<div className="flex flex-row justify-around items-start">
diff --git a/studio/web/assets/document.png b/studio/web/assets/document.png
new file mode 100644
index 0000000..3d2dda9
Binary files /dev/null and b/studio/web/assets/document.png differ
diff --git a/studio/web/components/ui/feature/searchSql.tsx b/studio/web/components/ui/feature/searchSql.tsx
index 8b91254..6e3c0ab 100644
--- a/studio/web/components/ui/feature/searchSql.tsx
+++ b/studio/web/components/ui/feature/searchSql.tsx
@@ -8,6 +8,13 @@ import {
   fetchRowsForTable,
   fetchSchemaForTable,
 } from "@/lib/actions/features/getSchema";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import { convertTextToSql } from "@/lib/actions/features/textToSql";
 import Loading from "../loading";
 import { fetchSqlForQuery } from "@/lib/actions/features/searchSql";
@@ -77,6 +84,11 @@ function SearchSql({ dataset }: { dataset: File }) {
       setLoading(false);
     }
   };
+
+  const selectOptions = [
+    { label: "Schema", value: "Schema" },
+    { label: "Rows", value: "Rows" },
+  ];
   return (
     <div className="flex flex-col gap-6 mb-10">
       <div className="mt-2 flex justify-between w-full gap-6">
@@ -106,20 +118,22 @@ function SearchSql({ dataset }: { dataset: File }) {
       <div className="flex justify-between">
         {textToSqlEnabled ? (
           <>
-            <div className="flex gap-6">
+            <div className="flex gap-6 items-center justify-center">
               <p>Search Results in:</p>
-              <div className="flex gap-2">
-                Schema
-                <Switch
-                  checked={selectedOption === "Rows"}
-                  onCheckedChange={() =>
-                    setSelectedOption(
-                      selectedOption === "Rows" ? "Schema" : "Rows",
-                    )
-                  }
-                />
-                Rows
-              </div>
+              <Select
+                onValueChange={(value) => setSelectedOption(value)}
+              >
+                <SelectTrigger className="w-[200px]">
+                  <SelectValue placeholder="SQL" />
+                </SelectTrigger>
+                <SelectContent>
+                  {selectOptions.map(({ label, value }) => (
+                    <SelectItem value={value} key={value}>
+                      {label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
             </div>
             <Button
               variant="link"