diff --git a/client/App.js b/client/App.js
index e67ec25..1d998ea 100644
--- a/client/App.js
+++ b/client/App.js
@@ -3,4 +3,4 @@ import Navigation from './components/Navigation';
 
 export default function App() {
   return <Navigation />;
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/client/package-lock.json b/client/package-lock.json
index 52c5fb5..ddb2408 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -19894,4 +19894,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/client/screens/Dashboard.js b/client/screens/Dashboard.js
index 1c174bb..7e9b3c6 100644
--- a/client/screens/Dashboard.js
+++ b/client/screens/Dashboard.js
@@ -5,6 +5,18 @@ import {
   StyleSheet,
   Image,
   ImageBackground,
+<<<<<<< HEAD
+  TouchableOpacity,
+  ScrollView
+} from "react-native";
+import { Card, Title, Button, Text } from "react-native-paper";
+import { getAuth, signOut } from "firebase/auth";
+import { CommonActions } from "@react-navigation/native";
+import Icon from "react-native-vector-icons/FontAwesome";
+import Icon1 from "react-native-vector-icons/FontAwesome5";
+import Icon2 from "react-native-vector-icons/Ionicons";
+import Carousel from "react-native-reanimated-carousel";
+=======
   TouchableOpacity
 } from 'react-native'
 import BottomNavigationR from '../components/BottomNavigationR'
@@ -15,6 +27,7 @@ import Icon from 'react-native-vector-icons/FontAwesome'
 import Icon1 from 'react-native-vector-icons/FontAwesome5'
 import Icon2 from 'react-native-vector-icons/Ionicons'
 import Carousel from 'react-native-reanimated-carousel'
+>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
 // import axios from "axios"; for fetching instagram posts
 
 const images = [
@@ -84,10 +97,11 @@ const Dashboard = ({ navigation }) => {
           </Button>
         </View>
       </View>
+      
       <View style={styles.cardCover}>
         <View style={styles.cardContainer}>
-          <Card style={styles.card1}>
-            <Card.Content>
+          <View style={styles.card1}>
+            
               <Text style={styles.content1}>Daily Reduction</Text>
               <Icon
                 name="circle-o-notch"
@@ -95,10 +109,10 @@ const Dashboard = ({ navigation }) => {
                 color="#000"
                 style={styles.cardlogo2}
               />
-            </Card.Content>
-          </Card>
-          <Card style={styles.card1}>
-            <Card.Content>
+            
+          </View>
+          <View style={styles.card1}>
+            
               <Text style={styles.content1}>Global Position</Text>
               <Icon
                 name="line-chart"
@@ -106,8 +120,8 @@ const Dashboard = ({ navigation }) => {
                 color="#000"
                 style={styles.cardlogo2}
               />
-            </Card.Content>
-          </Card>
+            
+          </View>
         </View>
         <View style={styles.cardContainer}>
           <Card style={styles.card}>
@@ -354,31 +368,63 @@ const styles = StyleSheet.create({
     marginTop: 25
   },
   cardContainer: {
+<<<<<<< HEAD
+    flexDirection: "row", 
+    justifyContent: "space-between",
+    margin: 11,
+    borderWidth :0,
+
+=======
     flexDirection: 'row',
     justifyContent: 'space-between',
     margin: 14
+>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
   },
   card2: {
     flex: 1,
     marginHorizontal: 3,
     height: 55,
+<<<<<<< HEAD
+    backgroundColor: "#FFFFED",
+    marginBottom: 0,
+    borderRadius: 0,
+=======
     backgroundColor: '#FFFFED',
     marginBottom: 0
+>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
   },
   card: {
     flex: 1,
     marginHorizontal: 3,
     height: 55,
     marginBottom: -20,
+<<<<<<< HEAD
+    backgroundColor: "#FFFFED",
+    borderRadius: 0,
+    borderWidth:1,
+    borderTopWidth:0,
+    borderColor:"#F7B4BB",
+=======
     backgroundColor: '#FFFFED'
+>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
   },
   card1: {
     flex: 1,
-    marginHorizontal: 15,
+    //marginHorizontal: 15,
     height: 80,
+<<<<<<< HEAD
+    //marginBottom: -20,
+    //marginTop: -5,
+    backgroundColor: "#FFFFED",
+    borderWidth: 0,
+    border: 0,
+    margin: 10,
+    padding: 5,
+=======
     marginBottom: -20,
     marginTop: -5,
     backgroundColor: '#FFFFED'
+>>>>>>> 5e57e9b24a82d10c2a1a4a6b4778f13801533161
   },
   emptySpace: {
     flex: 1
diff --git a/client/screens/Post.js b/client/screens/Post.js
index 017202d..5c306a0 100644
--- a/client/screens/Post.js
+++ b/client/screens/Post.js
@@ -13,7 +13,7 @@ import {
 
 export default function Post() {
   const [tweetContent, setTweetContent] = useState(
-    `Hey Guys, Check out [ToDo]! 
+    `Hey guys, check out @embertechworks! 
 
 Join me on Ember for:
     - Eco-transit
@@ -52,7 +52,7 @@ Let's go green!
           placeholder={'Enter Tweet Content'}
           style={styles.textInput}
           multiline={true}
-          numberOfLines={6}
+          numberOfLines={10}
         />
 
         <TouchableOpacity
@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: 'white',
     padding: 10,
-    textAlign: 'center'
+    textAlign: 'center',
   },
   titleText: {
     fontSize: 20,
@@ -96,11 +96,11 @@ const styles = StyleSheet.create({
     alignContent: 'center',
     justifyContent: 'center',
     alignItems: 'center',
-    marginLeft: 150,
+    marginLeft: 120,
     marginTop: 5,
     marginBottom: 10,
     margin: 50,
-    width: '20%',
+    width: '25%',
     borderRadius: 5,
     shadowColor: 'rgba(0, 0, 0, 0.2)',
     shadowOffset: { width: 0, height: 2 },
@@ -113,14 +113,16 @@ const styles = StyleSheet.create({
     fontWeight: 'bold'
   },
   textInput: {
-    height: 200,
+    height: 220,
     borderColor: 'gray',
-    borderWidth: 0.01,
+    borderWidth: 1,
     marginBottom: 20,
     padding: 10,
-    margin: 35,
-    width: '65%',
-    alignSelf: 'center'
+    margin: 40,
+    marginLeft: 20,
+    marginRight:20,
+    width: 300,
+    alignSelf: 'center',
   },
   logo: {
     width: 100,