Merge branch 'master' into tma728-select-school-onboarding

# Conflicts:
#	src/services/UserProfileService.ts
#	src/types/types.ts

1 files changed, 4 insertions, 5 deletions

diff --git a/src/components/moments/IndividualMomentTitleBar.tsx b/src/components/moments/IndividualMomentTitleBar.tsx
index 88e0c308..79453ade 100644
--- a/src/components/moments/IndividualMomentTitleBar.tsx
+++ b/src/components/moments/IndividualMomentTitleBar.tsx
@@ -29,14 +29,14 @@ const styles = StyleSheet.create({
   container: {
     flexDirection: 'row',
     alignItems: 'center',
-    justifyContent: 'center',
+    justifyContent: 'flex-start',
     height: '5%',
   },
   headerContainer: {
-    flexShrink: 1,
-    marginLeft: '11%',
+    width: '80%',
   },
   header: {
+    textAlign: 'center',
     color: 'white',
     fontSize: normalize(18),
     fontWeight: '700',
@@ -44,10 +44,9 @@ const styles = StyleSheet.create({
     letterSpacing: normalize(1.3),
   },
   closeButton: {
-    position: 'absolute',
     height: '50%',
     aspectRatio: 1,
-    left: '3%',
+    left: '8%',
   },
 });