diff --git a/App.tsx b/App.tsx
index 62b43f4..e08a156 100644
--- a/App.tsx
+++ b/App.tsx
@@ -13,31 +13,31 @@ import Register from "./src/Routes/Register/Register";
 import { Provider } from "react-redux";
 import Store from "./src/Features/Redux/Store/Store";
 import { QueryClient, QueryClientProvider } from "react-query";
-
+import EditNote from "./src/Routes/EditNote/EditNote";
 
 const Drawer = createDrawerNavigator();
 const queryClient = new QueryClient();
 
 export default function App() {
   return (
-  <Provider store={Store}>
-    <QueryClientProvider client={queryClient}>
-      <NavigationContainer>
-        <Drawer.Navigator
-          initialRouteName="Home"
-          drawerContent={CustomDrawerContent}
-          screenOptions={DrawerScreenSettings}
-        >
-         <Drawer.Screen name="Home" component={Home} />
-         <Drawer.Screen name="New Note" component={NewNote} />
-         <Drawer.Screen name="User Info" component={UserInfo} />
-         <Drawer.Screen name="Login" component={Login} />
-         <Drawer.Screen name="Register" component={Register} />
-         <Drawer.Screen name="LogOut" component={Register} />
-        
-        </Drawer.Navigator>
-      </NavigationContainer>
-    </QueryClientProvider>
-  </Provider>
+    <Provider store={Store}>
+      <QueryClientProvider client={queryClient}>
+        <NavigationContainer>
+          <Drawer.Navigator
+            initialRouteName="Home"
+            drawerContent={CustomDrawerContent}
+            screenOptions={DrawerScreenSettings}
+          >
+            <Drawer.Screen name="Home" component={Home} />
+            <Drawer.Screen name="New Note" component={NewNote} />
+            <Drawer.Screen name="User Info" component={UserInfo} />
+            <Drawer.Screen name="Login" component={Login} />
+            <Drawer.Screen name="Register" component={Register} />
+            <Drawer.Screen name="LogOut" component={Register} />
+            <Drawer.Screen name="EditNote" component={EditNote} />
+          </Drawer.Navigator>
+        </NavigationContainer>
+      </QueryClientProvider>
+    </Provider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/Components/Note/Note.tsx b/src/Components/Note/Note.tsx
index 19657c0..e56b355 100644
--- a/src/Components/Note/Note.tsx
+++ b/src/Components/Note/Note.tsx
@@ -1,9 +1,22 @@
 import * as React from "react";
 import { View, Text, TextInput, ScrollView } from "react-native";
 import styles from "../../styles";
-import { NoteProps } from "../../Interfaces/Interfaces";
+import { NoteProps, RootDrawerParamList } from "../../Interfaces/Interfaces";
+import ButtonCentered from "../Buttons/ButtonCentered/ButtonCentered";
+import { useQueryClient, useMutation } from "react-query";
+import { DeleteNote } from "../Api/Api";
+import { useNavigation } from "@react-navigation/native";
 
 export default function Note(props: NoteProps) {
+  const navigation = useNavigation<RootDrawerParamList>();
+  const queryClient = useQueryClient();
+  const mutation = useMutation({
+    mutationFn: DeleteNote,
+    onSuccess: () => {
+      queryClient.invalidateQueries("notes");
+      queryClient.invalidateQueries("public_notes");
+    },
+  });
   return (
     <View style={styles.addnotecont}>
       <View style={styles.tle}>
@@ -19,6 +32,32 @@ export default function Note(props: NoteProps) {
           <Text style={styles.typeinput}>{props.content}</Text>
         </ScrollView>
       </View>
+      <View style={styles.flex_row}>
+        <ButtonCentered
+          color={"Red"}
+          onPress={() => {
+            console.log("Deleted note id " + props.id);
+            mutation.mutate(props.id);
+          }}
+          width={64}
+        >
+          <Text style={{ ...styles.text_white, ...{ fontSize: 16 } }}>
+            Delete Note
+          </Text>
+        </ButtonCentered>
+        <ButtonCentered
+          color={"Yellow"}
+          onPress={() => {
+            navigation.navigate("EditNote", { noteId: props.id });
+            console.log("Editing note id " + props.id);
+          }}
+          width={64}
+        >
+          <Text style={{ ...styles.text_white, ...{ fontSize: 16 } }}>
+            Edit Note
+          </Text>
+        </ButtonCentered>
+      </View>
     </View>
   );
 }
diff --git a/src/Components/PublicNote/PublicNote.tsx b/src/Components/PublicNote/PublicNote.tsx
new file mode 100644
index 0000000..87e313e
--- /dev/null
+++ b/src/Components/PublicNote/PublicNote.tsx
@@ -0,0 +1,24 @@
+import * as React from "react";
+import { View, Text, TextInput, ScrollView } from "react-native";
+import styles from "../../styles";
+import { NoteProps } from "../../Interfaces/Interfaces";
+
+export default function PublicNote(props: NoteProps) {
+  return (
+    <View style={styles.addnotecont}>
+      <View style={styles.tle}>
+        <TextInput
+          style={styles.title}
+          value={props.title}
+          maxLength={20}
+          editable={false}
+        />
+      </View>
+      <View style={styles.typehere}>
+        <ScrollView style={styles.typeinput} nestedScrollEnabled={true}>
+          <Text style={styles.typeinput}>{props.content}</Text>
+        </ScrollView>
+      </View>
+    </View>
+  );
+}
diff --git a/src/Components/PublicNotes/Notes.tsx b/src/Components/PublicNotes/Notes.tsx
index efc4850..82ab0c1 100644
--- a/src/Components/PublicNotes/Notes.tsx
+++ b/src/Components/PublicNotes/Notes.tsx
@@ -8,6 +8,7 @@ import { RootState } from "../../Features/Redux/Store/Store";
 import { NoteProps, RootDrawerParamList } from "../../Interfaces/Interfaces";
 import { useNavigation } from "@react-navigation/native";
 import Note from "../Note/Note";
+import PublicNote from "../PublicNote/PublicNote";
 
 export default function PublicNotes() {
   const navigation = useNavigation<RootDrawerParamList>();
@@ -39,7 +40,7 @@ export default function PublicNotes() {
     <ScrollView contentContainerStyle={{ justifyContent: "center" }}>
       {notes.map((note: NoteProps, index: number) => {
         return (
-          <Note
+          <PublicNote
             id={note.id}
             key={index}
             title={note.title}
diff --git a/src/Interfaces/Interfaces.tsx b/src/Interfaces/Interfaces.tsx
index 14cc38f..3f31b60 100644
--- a/src/Interfaces/Interfaces.tsx
+++ b/src/Interfaces/Interfaces.tsx
@@ -59,10 +59,12 @@ export interface ActivationParams {
 export interface AddNoteParams {
   title: string;
   content: string;
+  public: boolean;
 }
 
 export interface UpdateNoteParams {
   id: number;
   title: string;
   content: string;
+  public: boolean;
 }
diff --git a/src/Routes/EditNote/EditNote.tsx b/src/Routes/EditNote/EditNote.tsx
new file mode 100644
index 0000000..3189e80
--- /dev/null
+++ b/src/Routes/EditNote/EditNote.tsx
@@ -0,0 +1,135 @@
+import * as React from "react";
+import { View, Text, TextInput, Switch } from "react-native";
+import styles from "../../styles";
+import Background from "../../Components/Background/Background";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { useEffect, useState } from "react";
+import { TouchableOpacity } from "react-native";
+import { RootDrawerParamList } from "../../Interfaces/Interfaces";
+import { useNavigation } from "@react-navigation/native";
+import { useMutation, useQuery, useQueryClient } from "react-query";
+import { AddNote, GetNote, UpdateNote } from "../../Components/Api/Api";
+
+export default function EditNote({ navigation, route }: any) {
+  const { noteId } = route.params;
+  const [note, setNote] = useState({
+    title: "",
+    content: "",
+    public: false,
+  });
+  async function retrieve() {
+    let a = await GetNote(noteId);
+    setNote(a);
+    return a;
+  }
+  const { data, isLoading, error } = useQuery("note", retrieve, {
+    retry: 0,
+  });
+  useEffect(() => {
+    setNote(data);
+  }, [data]);
+
+  const queryClient = useQueryClient();
+  const mutation = useMutation({
+    mutationFn: UpdateNote,
+    onSuccess: () => {
+      queryClient.invalidateQueries("notes");
+      queryClient.invalidateQueries("public_notes");
+    },
+  });
+  if (error) {
+    return (
+      <Background>
+        <Text style={{ ...styles.text_white, ...{ fontSize: 32 } }}>
+          Error retrieving specific note
+        </Text>
+      </Background>
+    );
+  }
+  if (isLoading) {
+    return (
+      <Background>
+        <Text style={{ ...styles.text_white, ...{ fontSize: 32 } }}>
+          Loading note...
+        </Text>
+      </Background>
+    );
+  }
+  if (data && note) {
+    return (
+      <Background>
+        <Text style={{ ...styles.text_white, ...{ fontSize: 32 } }}>
+          Edit Note
+        </Text>
+        <View style={styles.addnotecont}>
+          <View style={styles.tle}>
+            <TextInput
+              style={styles.title}
+              placeholder="Title"
+              placeholderTextColor="white"
+              value={note.title}
+              onChangeText={(text) => {
+                setNote({ ...note, title: text });
+              }}
+              maxLength={20}
+            />
+          </View>
+          <View style={styles.typehere}>
+            <TextInput
+              style={styles.typeinput}
+              placeholder="Type here...."
+              placeholderTextColor="white"
+              value={note.content}
+              multiline={true}
+              onChangeText={async (text) => {
+                await setNote({ ...note, content: text });
+              }}
+            />
+          </View>
+          <View
+            style={{
+              display: "flex",
+              flexDirection: "row",
+              justifyContent: "flex-start",
+              marginLeft: 16,
+              alignItems: "center",
+            }}
+          >
+            <Switch
+              onValueChange={() => setNote({ ...note, public: !note.public })}
+              value={note.public}
+            />
+            <Text style={{ ...styles.text_white, ...{ fontSize: 16 } }}>
+              Public?
+            </Text>
+          </View>
+          <TouchableOpacity
+            style={styles.savebtn}
+            onPress={async () => {
+              try {
+                await mutation.mutate({
+                  title: note.title,
+                  content: note.content,
+                  public: note.public,
+                  id: noteId,
+                });
+                navigation.navigate("Home");
+              } catch (error) {}
+              console.log(note.content);
+            }}
+          >
+            <Text style={styles.savenote}>SAVE</Text>
+          </TouchableOpacity>
+          <TouchableOpacity
+            style={styles.cancelbtn}
+            onPress={() => {
+              navigation.navigate("Home");
+            }}
+          >
+            <Text style={styles.cancel}>CANCEL</Text>
+          </TouchableOpacity>
+        </View>
+      </Background>
+    );
+  }
+}
diff --git a/src/Routes/NewNote/NewNote.tsx b/src/Routes/NewNote/NewNote.tsx
index e10b50c..54a0fef 100644
--- a/src/Routes/NewNote/NewNote.tsx
+++ b/src/Routes/NewNote/NewNote.tsx
@@ -1,10 +1,10 @@
-import * as React from 'react';
-import {View, Text, TextInput} from 'react-native';
-import styles from '../../styles';
-import Background from '../../Components/Background/Background';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import * as React from "react";
+import { View, Text, TextInput, Switch } from "react-native";
+import styles from "../../styles";
+import Background from "../../Components/Background/Background";
+import { SafeAreaView } from "react-native-safe-area-context";
 import { useState } from "react";
-import {TouchableOpacity,} from "react-native";
+import { TouchableOpacity } from "react-native";
 import { RootDrawerParamList } from "../../Interfaces/Interfaces";
 import { useNavigation } from "@react-navigation/native";
 import { useMutation, useQueryClient } from "react-query";
@@ -14,10 +14,11 @@ export default function NewNote() {
   const [note, setNote] = useState({
     title: "",
     content: "",
+    public: false,
   });
 
   const navigation = useNavigation<RootDrawerParamList>();
- 
+
   const queryClient = useQueryClient();
   const mutation = useMutation({
     mutationFn: AddNote,
@@ -28,54 +29,77 @@ export default function NewNote() {
 
   return (
     <Background>
-      <Text style={{...styles.text_white, ...{fontSize: 32}}}>New Note</Text>
-      <SafeAreaView>  
-      <View style={styles.addnotecont}> 
-      <View style={styles.tle}>
-      <TextInput 
-            style={styles.title}
-            placeholder="Title"
-            placeholderTextColor="white"
-            value={note.title}
-            onChangeText={(text) => {
-              setNote({ ...note, title: text });
+      <Text style={{ ...styles.text_white, ...{ fontSize: 32 } }}>
+        New Note
+      </Text>
+      <SafeAreaView>
+        <View style={styles.addnotecont}>
+          <View style={styles.tle}>
+            <TextInput
+              style={styles.title}
+              placeholder="Title"
+              placeholderTextColor="white"
+              value={note.title}
+              onChangeText={(text) => {
+                setNote({ ...note, title: text });
+              }}
+              maxLength={20}
+            />
+          </View>
+          <View style={styles.typehere}>
+            <TextInput
+              style={styles.typeinput}
+              placeholder="Type here...."
+              placeholderTextColor="white"
+              value={note.content}
+              multiline={true}
+              onChangeText={async (text) => {
+                await setNote({ ...note, content: text });
+              }}
+            />
+          </View>
+          <View
+            style={{
+              display: "flex",
+              flexDirection: "row",
+              justifyContent: "flex-start",
+              marginLeft: 16,
+              alignItems: "center",
             }}
-            maxLength={20}
-          />
-        </View>   
-        <View style={styles.typehere}> 
-        <TextInput 
-            style={styles.typeinput}
-            placeholder="Type here...."
-            placeholderTextColor="white"
-            value={note.content} 
-            onChangeText={async (text) => {
-              await setNote({ ...note, content: text });
+          >
+            <Switch
+              onValueChange={() => setNote({ ...note, public: !note.public })}
+              value={note.public}
+            />
+            <Text style={{ ...styles.text_white, ...{ fontSize: 16 } }}>
+              Public?
+            </Text>
+          </View>
+          <TouchableOpacity
+            style={styles.savebtn}
+            onPress={async () => {
+              try {
+                await mutation.mutate({
+                  title: note.title,
+                  content: note.content,
+                  public: note.public,
+                });
+                navigation.navigate("Home");
+              } catch (error) {}
+              console.log(note.content);
             }}
-          /> 
-       </View>
-      <TouchableOpacity style={styles.savebtn}
-        onPress={async () => {
-          try {
-            await mutation.mutate({
-              title: note.title,
-              content: note.content,
-            });
-            navigation.navigate("Home");
-          } catch (error) {}
-          console.log(note.content)
-        }}>
-        
-      <Text style={styles.savenote}>SAVE</Text>
-      </TouchableOpacity>
-      <TouchableOpacity style={styles.cancelbtn}
-       onPress={() => {
-        navigation.navigate("Home");  
-      }}>
-      <Text style={styles.cancel}>CANCEL</Text>
-      </TouchableOpacity>
-      </View>
-      
+          >
+            <Text style={styles.savenote}>SAVE</Text>
+          </TouchableOpacity>
+          <TouchableOpacity
+            style={styles.cancelbtn}
+            onPress={() => {
+              navigation.navigate("Home");
+            }}
+          >
+            <Text style={styles.cancel}>CANCEL</Text>
+          </TouchableOpacity>
+        </View>
       </SafeAreaView>
     </Background>
   );
diff --git a/src/styles.tsx b/src/styles.tsx
index 7b212a1..a77b043 100644
--- a/src/styles.tsx
+++ b/src/styles.tsx
@@ -158,9 +158,10 @@ const styles = StyleSheet.create({
   },
   typeinput: {
     color: "white",
-    flex: 1,
-    paddingBottom: 250,
+    marginBottom: 16,
     marginLeft: 5,
+    minHeight: 128,
+    maxHeight: 768,
   },
   title: {
     color: "white",
@@ -179,7 +180,8 @@ const styles = StyleSheet.create({
   addnotecont: {
     marginTop: 30,
     marginLeft: 22,
-    height: 500,
+    paddingBottom: 30,
+    minHeight: 500,
     width: 350,
     borderRadius: 25,
     backgroundColor: "black",