diff --git a/LICENSE b/LICENSE
index b3bc1d5..dfe091a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Eric Wang
+Copyright (c) 2020 FRC Rebels 2638
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/app.json b/app.json
index 5a48bb7..546c847 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "expo": {
-    "name": "Parts App",
-    "slug": "PartsApp",
+    "name": "FRC Parts and Tools",
+    "slug": "FRCPartsAndTools",
     "privacy": "public",
     "sdkVersion": "36.0.0",
     "platforms": [
@@ -9,7 +9,7 @@
       "android",
       "web"
     ],
-    "version": "1.0.1",
+    "version": "1.0.2",
     "orientation": "default",
     "icon": "./assets/images/icon.png",
     "splash": {
diff --git a/screens/AboutScreen.js b/screens/AboutScreen.js
index 9c9a89d..a5e3710 100644
--- a/screens/AboutScreen.js
+++ b/screens/AboutScreen.js
@@ -8,7 +8,8 @@ import {
 	ScrollView,
 	Linking,
 	TouchableOpacity,
-	StatusBar
+	StatusBar,
+	SafeAreaView
 } from 'react-native';
 
 import TabBarIcon from '../components/TabBarIcon.js';
@@ -18,85 +19,87 @@ export default class AboutScreen extends React.Component {
 	render() {
 		return (
 			<View style={styles.container}>
-				<StatusBar hidden />
-				<View style={styles.headerContainer}>
-					<View style = {{flex: 1, alignSelf: "center"}}>
-                        <TouchableOpacity onPress = {() => this.props.navigation.goBack()}>
-                            <View style = {styles.backContainer}>
-                                <TabBarIcon color = {"#29adff"} name = {"angle-left"} />
-                                <Text style = {styles.backText}> BACK</Text>
-                            </View>
-                        </TouchableOpacity>
-                    </View>
-
-					<View style = {{flex: 1}}>
-                        <Text style = {styles.header}>About</Text>
-                    </View>
-
-					<View style = {{flex: 1}} />
-				</View>
-                
-				<ScrollView style={styles.container}>
-					<View style = {styles.imageContainer}>
-						<Image
-							style = {{
-								width: 300,
-								height: 300,
-								resizeMode: "contain",
-								borderRadius: 10
-							}}
-							source = {require(`../Assets/Symbols/14.png`)}
-						/>
-					</View>
+				<SafeAreaView style = {{flex: 1, backgroundColor: "#ddd"}}>
+					<StatusBar hidden />
+					<View style={styles.headerContainer}>
+						<View style = {{flex: 1, alignSelf: "center"}}>
+							<TouchableOpacity onPress = {() => this.props.navigation.goBack()}>
+								<View style = {styles.backContainer}>
+									<TabBarIcon color = {"#29adff"} name = {"angle-left"} />
+									<Text style = {styles.backText}> BACK</Text>
+								</View>
+							</TouchableOpacity>
+						</View>
 
-					<View style={styles.iconsContainer}>
+						<View style = {{flex: 1}}>
+							<Text style = {styles.header}>About</Text>
+						</View>
 
-						<IconButton name = 'Version 1.0' iconName = 'cog'/>
-						
-						<IconButton name = "Made by FRC Team 2638 in Great Neck, NY" iconName = 'map-marker'/>
-						
-						<IconButton onPress = {() => Linking.openURL("https://www.gnsrobotics.com/")} name = "Website" iconName = 'link'/>
-						
+						<View style = {{flex: 1}} />
 					</View>
-
-					<View style={styles.creditsContainer}>
-						<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
-						
-						<Text style={styles.credits}>{`App Development Team 2020\nReid Fleishman\nEric Yachbes\nKevin Wang\nEric Wang (for a bit)\n\nUI Design and App Concept by\nReid Fleishman\n\nApp Programmed by\nEric Yachbes\nKevin Wang`}</Text>
-						
-						
-						<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
-
-						<Text style={styles.credits}>{`Special Thanks To\nAndrew Dea for helping organize the whole thing\n\nCole Kniesly and especially Mrs. Zinn for proofreading the descriptions (like "Scratch All").  You are truly Zinntastic!\n\nOur mentors John Motchkavitz, Mr. Corrigan, Squeegee, the aforementioned Mrs. Zinn, and our other mentors.`}</Text>
-
-						<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
-
-						<Text style={styles.credits}>{`Much of the content in this app was compiled by the Freshman Class of 2020 (HS Class of 2023) as part of an activity.  So, we would like to thank the following students who contributed to this app:\n\nIsaac Ahn\nAntranig Baghdassarian\nOskar Bohaczyk\nElia Botros\nIssac Chan\nSooah Kwak\nThomas Lo\nLeo Lui`}</Text>
-
-						<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
-
+					
+					<ScrollView style={styles.container}>
 						<View style = {styles.imageContainer}>
 							<Image
 								style = {{
-									width: 150,
-									height: 150,
+									width: 300,
+									height: 300,
 									resizeMode: "contain",
+									borderRadius: 10
 								}}
-								source = {require(`../Assets/Symbols/16.png`)}
+								source = {require(`../Assets/Symbols/14.png`)}
 							/>
 						</View>
 
-						<Text style={{
-							textAlign: "center",
-							fontSize: 15,
-							paddingBottom: 10}}
-						>
-							© 2020 Rebel Robotics
-						</Text>
-					</View>
+						<View style={styles.iconsContainer}>
 
-					
-				</ScrollView>
+							<IconButton name = 'Version 1.0.2' iconName = 'cog'/>
+							
+							<IconButton name = "Made by FRC Team 2638 in Great Neck, NY" iconName = 'map-marker'/>
+							
+							<IconButton onPress = {() => Linking.openURL("https://www.gnsrobotics.com/")} name = "Website" iconName = 'link'/>
+							
+						</View>
+
+						<View style={styles.creditsContainer}>
+							<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
+							
+							<Text style={styles.credits}>{`App Development Team 2020\nReid Fleishman\nEric Yachbes\nKevin Wang\nEric Wang (for a bit)\n\nUI Design and App Concept by\nReid Fleishman\n\nApp Programmed by\nEric Yachbes\nKevin Wang`}</Text>
+							
+							
+							<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
+
+							<Text style={styles.credits}>{`Special Thanks To\nAndrew Dea for helping organize the whole thing\n\nCole Kniesly and especially Mrs. Zinn for proofreading the descriptions (like "Scratch All").  You are truly Zinntastic!\n\nOur mentors John Motchkavitz, Mr. Corrigan, Squeegee, the aforementioned Mrs. Zinn, and our other mentors.`}</Text>
+
+							<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
+
+							<Text style={styles.credits}>{`Much of the content in this app was compiled by the Freshman Class of 2020 (HS Class of 2023) as part of an activity.  So, we would like to thank the following students who contributed to this app:\n\nIsaac Ahn\nAntranig Baghdassarian\nOskar Bohaczyk\nElia Botros\nIssac Chan\nSooah Kwak\nThomas Lo\nLeo Lui`}</Text>
+
+							<View style = {styles.hrContainer}><View style = {styles.hr}></View></View>
+
+							<View style = {styles.imageContainer}>
+								<Image
+									style = {{
+										width: 150,
+										height: 150,
+										resizeMode: "contain",
+									}}
+									source = {require(`../Assets/Symbols/16.png`)}
+								/>
+							</View>
+
+							<Text style={{
+								textAlign: "center",
+								fontSize: 15,
+								paddingBottom: 10}}
+							>
+								© 2020 Rebel Robotics
+							</Text>
+						</View>
+
+						
+					</ScrollView>
+				</SafeAreaView>
 			</View>
 		);
 	}
diff --git a/screens/FavoritesScreen.js b/screens/FavoritesScreen.js
index 4cbd855..8be02c0 100644
--- a/screens/FavoritesScreen.js
+++ b/screens/FavoritesScreen.js
@@ -5,24 +5,27 @@ import {
 	Text,
     View,
     Dimensions,
-    StatusBar
+    StatusBar,
+    SafeAreaView
 } from 'react-native';
 
 export default class FavoritesScreen extends React.Component {
 	render() {
 		return (
 			<View style={styles.container}>
-                <StatusBar hidden />
-				<View style={styles.headerContainer}>
-					<Text style={styles.header}>Favorites</Text>
-				</View>
-                <View style = {styles.bodyContainer}>
-                    <View style = {{flex: 1}}></View>
-                    <View style = {styles.largeTextContainer}>
-                        <Text style = {styles.largeText}>Coming Soon!</Text>
+                <SafeAreaView style = {{flex: 1, backgroundColor: "#ddd"}}>
+                    <StatusBar hidden />
+                    <View style={styles.headerContainer}>
+                        <Text style={styles.header}>Favorites</Text>
                     </View>
-                    <View style = {{flex: 1}}></View>
-                </View>
+                    <View style = {styles.bodyContainer}>
+                        <View style = {{flex: 1}}></View>
+                        <View style = {styles.largeTextContainer}>
+                            <Text style = {styles.largeText}>Coming Soon!</Text>
+                        </View>
+                        <View style = {{flex: 1}}></View>
+                    </View>
+                </SafeAreaView>
 			</View>
 		);
 	}
diff --git a/screens/ItemScreen.js b/screens/ItemScreen.js
index b4ac7c0..6915e10 100644
--- a/screens/ItemScreen.js
+++ b/screens/ItemScreen.js
@@ -8,7 +8,8 @@ import {
 	ScrollView,
 	Linking,
     TouchableOpacity,
-    StatusBar
+    StatusBar,
+    SafeAreaView
 } from 'react-native';
 
 import TabBarIcon from '../components/TabBarIcon.js';
@@ -22,50 +23,52 @@ export default class ItemScreen extends React.Component {
 
 		return (
 			<View style = {styles.container}>
-                <StatusBar hidden />
-				<View style = {styles.headerContainer}>
+                <SafeAreaView style = {{flex: 1, backgroundColor: "#ddd"}}>
+                    <StatusBar hidden />
+                    <View style = {styles.headerContainer}>
 
-                    <View style = {{flex: 1, alignSelf: "center"}}>
-                        <TouchableOpacity onPress = {() => this.props.navigation.goBack()}>
-                            <View style = {styles.backContainer}>
-                                <TabBarIcon color = {"#29adff"} name = {"angle-left"} />
-                                <Text style = {styles.backText}> BACK</Text>
-                            </View>
-                        </TouchableOpacity>
-                    </View>
+                        <View style = {{flex: 1, alignSelf: "center"}}>
+                            <TouchableOpacity onPress = {() => this.props.navigation.goBack()}>
+                                <View style = {styles.backContainer}>
+                                    <TabBarIcon color = {"#29adff"} name = {"angle-left"} />
+                                    <Text style = {styles.backText}> BACK</Text>
+                                </View>
+                            </TouchableOpacity>
+                        </View>
 
-                    <View style = {{flex: 1, alignSelf: "center"}}>
-                        <Text style = {styles.header}>{item.name}</Text>
-                    </View>
+                        <View style = {{flex: 1, alignSelf: "center"}}>
+                            <Text style = {styles.header}>{item.name}</Text>
+                        </View>
 
-                    <View style = {{flex: 1, alignItems: "flex-end", alignSelf: "center"}} />
+                        <View style = {{flex: 1, alignItems: "flex-end", alignSelf: "center"}} />
 
-				</View>
+                    </View>
 
-				<ScrollView style = {styles.container}>
-					<View style = {styles.imageContainer}>
-						<Image
-							style = {styles.image}
-							source = {item.fileName[currentImage]}
-						/>
-					</View>
+                    <ScrollView style = {styles.container}>
+                        <View style = {styles.imageContainer}>
+                            <Image
+                                style = {styles.image}
+                                source = {item.fileName[currentImage]}
+                            />
+                        </View>
 
-					<View style={styles.iconsContainer}>
-						<IconButton
-							name = {type}
-							iconName = {type == 'Parts' ? 'cog' : 'wrench'}
-						/>
-						
-						<IconButton name={item.found} iconName = 'map-marker'/>
-						
-						{item.vendor ? <IconButton onPress = {() => Linking.openURL(item.link)} name={item.vendor} iconName = 'shopping-cart'/> : <View></View>}
-						
-					</View>
+                        <View style={styles.iconsContainer}>
+                            <IconButton
+                                name = {type}
+                                iconName = {type == 'Parts' ? 'cog' : 'wrench'}
+                            />
+                            
+                            <IconButton name={item.found} iconName = 'map-marker'/>
+                            
+                            {item.vendor ? <IconButton onPress = {() => Linking.openURL(item.link)} name={item.vendor} iconName = 'shopping-cart'/> : <View></View>}
+                            
+                        </View>
 
-					<View style={styles.descriptionContainer}>
-						<Text style={styles.description}>{item.description}</Text>
-					</View>
-				</ScrollView>
+                        <View style={styles.descriptionContainer}>
+                            <Text style={styles.description}>{item.description}</Text>
+                        </View>
+                    </ScrollView>
+                </SafeAreaView>
 			</View>
 		);
 	}
diff --git a/screens/MoreScreen.js b/screens/MoreScreen.js
index e83cd9b..e6561b9 100644
--- a/screens/MoreScreen.js
+++ b/screens/MoreScreen.js
@@ -6,7 +6,8 @@ import {
 	View,
 	Linking,
 	StatusBar,
-	Alert
+	Alert,
+	SafeAreaView
 } from 'react-native';
 
 import IconButton from '../components/IconButton.js';
@@ -15,7 +16,8 @@ export default class MoreScreen extends React.Component {
 	render() {
 	return (
 		<View style={styles.container}>
-			<StatusBar hidden />
+			<SafeAreaView style = {{flex: 1, backgroundColor: "#ddd"}}>
+				<StatusBar hidden />
 				<View style = {styles.headerContainer}>
 						<Text style = {styles.header}>More</Text>
 				</View>
@@ -30,6 +32,7 @@ export default class MoreScreen extends React.Component {
 						iconName='pencil-square'
 					/>
 				</View>
+			</SafeAreaView>
 		</View>
 	);
 	}
@@ -55,8 +58,10 @@ const styles = StyleSheet.create({
 				textAlign: "center"
 		},
 		iconsContainer: {
+				flex: 1,
 				flexDirection: "row",
 				flexWrap: "wrap",
-				alignItems: "stretch"
+				alignItems: "stretch",
+				backgroundColor: "#fff"
 		}
 });
diff --git a/util/isIphoneX.js b/util/isIphoneX.js
new file mode 100644
index 0000000..59355d7
--- /dev/null
+++ b/util/isIphoneX.js
@@ -0,0 +1,15 @@
+import { Dimensions, Platform } from 'react-native';
+
+export function isIphoneX() {
+  const dim = Dimensions.get('window');
+  
+  return Platform.OS === 'ios' && (isIPhoneXSize(dim) || isIPhoneXrSize(dim));
+}
+
+export function isIPhoneXSize(dim) {
+  return dim.height == 812 || dim.width == 812;
+}
+
+export function isIPhoneXrSize(dim) {
+  return dim.height == 896 || dim.width == 896;
+}
\ No newline at end of file