diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,19 +8,19 @@
     "preset": "jest-expo"
   },
   "dependencies": {
-    "@expo/samples": "2.1.1",
+    "@expo/samples": "^2.1.1",
     "axios": "^0.18.0",
     "expo": "^25.0.0",
     "react": "16.2.0",
     "react-native": "https://github.com/expo/react-native/archive/sdk-25.0.0.tar.gz",
-    "react-native-calendars": "^1.17.3",
+    "react-native-calendars": "^1.19.3",
     "react-native-check-box": "^2.1.0",
-    "react-native-elements": "^0.19.0",
+    "react-native-elements": "^0.19.1",
     "react-native-google-signin": "^0.12.0",
     "react-native-keyboard-aware-scrollview": "^2.0.0",
     "react-native-settings-list": "^1.8.0",
     "react-native-vector-icons": "^4.6.0",
-    "react-navigation": "^1.0.0-beta.27",
+    "react-navigation": "^1.5.12",
     "rn-round-checkbox": "^0.3.4"
   },
   "devDependencies": {

diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
@@ -129,14 +129,14 @@ export default class HomeScreen extends React.Component {
   render() {
     return (
       <ImageBackground
-        source={require('../assets/images/milkyWay.jpg')}
+        source={require('../assets/images/gifBackground.gif')}
         style={styles.container}
       >
         <Image
           source={this.state.completions}
           style={styles.starImage}
         />
-        <Text style={styles.welcome}>Welcome, human user</Text>
+        <Text> </Text>
         <View style={styles.buttonsRow}>
           {buttons.slice(0, 3).map(button => this.renderButton(button))}
         </View>
@@ -196,6 +196,7 @@ const styles = StyleSheet.create({
   },
   buttonText: {
     color: '#f3e1f7',
+    fontSize: 24,
   }
 });
 
diff --git a/screens/JournalScreen.js b/screens/JournalScreen.js
@@ -99,8 +99,6 @@ const styles = StyleSheet.create({
     flex: 1,
     flexDirection: 'column',
     alignItems: 'center',
-    // marginTop: 50,
-    // backgroundColor: '#fff'
   },
   buttonsContainer: {
     flex: 1,
@@ -123,7 +121,7 @@ const styles = StyleSheet.create({
   },
   button: {
     backgroundColor: '#c394cc',
-    borderRadius: 5,
+    borderRadius: 50,
     marginBottom: 5,
     borderRadius: 50
   }

diff --git a/screens/SigninScreen.js b/screens/SigninScreen.js
@@ -108,11 +108,7 @@ export default class SigninScreen extends React.Component {
             buttonStyle={styles.button}
             titleStyle={{ color: 'black' }}
             color='navy'
-<<<<<<< HEAD
-            bottom='50'
-=======
             alignItems={{textAlign: "right"}}
->>>>>>> f349749526ceec3f1ee56ed920fef32236ed787f
           />
           <Text style={styles.forgotPassword}>Forgot Password?
             </Text>

diff --git a/screens/TodoScreen.js b/screens/TodoScreen.js
@@ -97,10 +97,10 @@ export default class TodoScreen extends React.Component {
       );
     });
     return (
-      // <ImageBackground
-      //   source={require('../assets/images/milkyWay.jpg')}
-      //   style={styles.container}
-      // >
+      <ImageBackground
+        source={require('../assets/images/milkyWay.jpg')}
+        style={styles.container}
+      >
       <ScrollView contentContainerStyle={styles.container}>
         <View style={styles.todoContainer}>
           <Text style={styles.headingText}>To do list for {this.state.date}:</Text>
@@ -138,7 +138,7 @@ export default class TodoScreen extends React.Component {
           </View>
         </Modal>
       </ScrollView>
-      // </ImageBackground>
+      </ImageBackground>
     );
   }
 }
@@ -155,7 +155,7 @@ const styles = StyleSheet.create({
   },
   button: {
     backgroundColor: '#c394cc',
-    borderRadius: 5,
+    borderRadius: 50,
     marginBottom: 5
   },
   headingText: {

diff --git a/screens/Water.js b/screens/Water.js
@@ -1,5 +1,11 @@
 import React from 'react';
-import { ScrollView, Text, StyleSheet, Picker } from 'react-native';
+import { 
+  ScrollView, 
+  Text, 
+  StyleSheet, 
+  Picker,
+  ImageBackground 
+} from 'react-native';
 import { Button } from 'react-native-elements';
 import { Ionicons } from '@expo/vector-icons';
 
@@ -17,10 +23,14 @@ export default class Sleep extends React.Component {
 
   render() {
     return (
+      <ImageBackground
+        source={require('../assets/images/milkyWay.jpg')}
+        style={styles.container}
+      >
       <ScrollView contentContainerStyle={styles.container}>
-        <Text>How many hours did you sleep last night??</Text>
+        <Text style={styles.heading}>How many hours did you sleep last night?</Text>
         <Picker
-          style={{ width: 100 }}
+          style={styles.picker}
           selectedValue={this.state.selectedValue}
           onValueChange={selectedValue => this.setState({ selectedValue })}
         >
@@ -40,22 +50,35 @@ export default class Sleep extends React.Component {
           buttonStyle={styles.button}
         />
       </ScrollView>
+      </ImageBackground>
     )
   }
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    paddingTop: 15,
-    backgroundColor: '#fff',
-    justifyContent: 'center',
-    alignItems: 'center'
+    flexDirection: 'column',
+    alignItems: 'center',
+  },
+  heading: {
+    fontSize: 25,
+    marginTop: 200,
+    textAlign: 'center',
+    color: '#eac369'
   },
   button: {
-    backgroundColor: 'blue',
-    borderRadius: 5,
+    backgroundColor: '#c394cc',
+    color: '#f3e1f7',
+    borderRadius: 50,
     marginBottom: 5,
-    borderRadius: 50
+    borderRadius: 50,
+    marginTop: 30,
+  },
+  picker: {
+    width: 100, 
+    color: '#f3e1f7', 
+    backgroundColor: '#c394cc',
+    marginTop: 100, 
   }
 });