diff --git a/assets/fonts/HighSpirited.ttf b/assets/fonts/HighSpirited.ttf
deleted file mode 100644
index c64914f..0000000
Binary files a/assets/fonts/HighSpirited.ttf and /dev/null differ
diff --git a/assets/fonts/Montserrat/MontserratBlackItalic900.ttf b/assets/fonts/Montserrat/Montserrat Black Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratBlackItalic900.ttf
rename to assets/fonts/Montserrat/Montserrat Black Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratBlack900.ttf b/assets/fonts/Montserrat/Montserrat Black.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratBlack900.ttf
rename to assets/fonts/Montserrat/Montserrat Black.ttf
diff --git a/assets/fonts/Montserrat/MontserratBoldItalic700.ttf b/assets/fonts/Montserrat/Montserrat Bold Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratBoldItalic700.ttf
rename to assets/fonts/Montserrat/Montserrat Bold Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratBold700.ttf b/assets/fonts/Montserrat/Montserrat Bold.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratBold700.ttf
rename to assets/fonts/Montserrat/Montserrat Bold.ttf
diff --git a/assets/fonts/Montserrat/MontserratExtraBoldItalic800.ttf b/assets/fonts/Montserrat/Montserrat Extra Bold Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratExtraBoldItalic800.ttf
rename to assets/fonts/Montserrat/Montserrat Extra Bold Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratExtraBold800.ttf b/assets/fonts/Montserrat/Montserrat Extra Bold.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratExtraBold800.ttf
rename to assets/fonts/Montserrat/Montserrat Extra Bold.ttf
diff --git a/assets/fonts/Montserrat/MontserratExtraLightItalic 275.ttf b/assets/fonts/Montserrat/Montserrat Extra Light Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratExtraLightItalic 275.ttf
rename to assets/fonts/Montserrat/Montserrat Extra Light Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratExtraLight275.ttf b/assets/fonts/Montserrat/Montserrat Extra Light.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratExtraLight275.ttf
rename to assets/fonts/Montserrat/Montserrat Extra Light.ttf
diff --git a/assets/fonts/Montserrat/MontserratItalic400.ttf b/assets/fonts/Montserrat/Montserrat Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratItalic400.ttf
rename to assets/fonts/Montserrat/Montserrat Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratLightItalic300.ttf b/assets/fonts/Montserrat/Montserrat Light Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratLightItalic300.ttf
rename to assets/fonts/Montserrat/Montserrat Light Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratLight300.ttf b/assets/fonts/Montserrat/Montserrat Light.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratLight300.ttf
rename to assets/fonts/Montserrat/Montserrat Light.ttf
diff --git a/assets/fonts/Montserrat/MontserratMediumItalic500.ttf b/assets/fonts/Montserrat/Montserrat Medium Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratMediumItalic500.ttf
rename to assets/fonts/Montserrat/Montserrat Medium Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratMedium500.ttf b/assets/fonts/Montserrat/Montserrat Medium.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratMedium500.ttf
rename to assets/fonts/Montserrat/Montserrat Medium.ttf
diff --git a/assets/fonts/Montserrat/MontserratRegular400.ttf b/assets/fonts/Montserrat/Montserrat Regular.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratRegular400.ttf
rename to assets/fonts/Montserrat/Montserrat Regular.ttf
diff --git a/assets/fonts/Montserrat/MontserratSemiBoldItalic600.ttf b/assets/fonts/Montserrat/Montserrat Semi Bold Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratSemiBoldItalic600.ttf
rename to assets/fonts/Montserrat/Montserrat Semi Bold Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratSemiBold600.ttf b/assets/fonts/Montserrat/Montserrat Semi Bold.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratSemiBold600.ttf
rename to assets/fonts/Montserrat/Montserrat Semi Bold.ttf
diff --git a/assets/fonts/Montserrat/MontserratThinItalic250.ttf b/assets/fonts/Montserrat/Montserrat Thin Italic.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratThinItalic250.ttf
rename to assets/fonts/Montserrat/Montserrat Thin Italic.ttf
diff --git a/assets/fonts/Montserrat/MontserratThin250.ttf b/assets/fonts/Montserrat/Montserrat Thin.ttf
similarity index 100%
rename from assets/fonts/Montserrat/MontserratThin250.ttf
rename to assets/fonts/Montserrat/Montserrat Thin.ttf
diff --git a/project.xml b/project.xml
index 3aa550f..8ee5027 100644
--- a/project.xml
+++ b/project.xml
@@ -29,11 +29,10 @@
 	<icon path="assets/icons/app_icon.svg"/>
 
 	<assets path="assets">
-		<font path="fonts/Montserrat/MontserratLight300.ttf" id="MontserratLight300" embed="true"/>	
-		<font path="fonts/Montserrat/MontserratRegular400.ttf" id="MontserratRegular400" embed="true"/>	
-    	<font path="fonts/Montserrat/MontserratMedium500.ttf" id="MontserratMedium500" embed="true"/>
-		<font path="fonts/Montserrat/MontserratBold700.ttf" id="MontserratBold700" embed="true"/>
-		<font path="fonts/HighSpirited.ttf" id="HighSpirited" embed="true"/>
+		<font path="fonts/Montserrat/Montserrat Light.ttf" id="Montserrat Light" embed="true"/>	
+		<font path="fonts/Montserrat/Montserrat Regular.ttf" id="Montserrat Regular" embed="true"/>	
+    	<font path="fonts/Montserrat/Montserrat Medium.ttf" id="Montserrat Medium" embed="true"/>
+		<font path="fonts/Montserrat/Montserrat Bold.ttf" id="Montserrat Bold" embed="true"/>
 	</assets>
 
 	<!-- copies data/Employees.xml to output -->
diff --git a/src/model/Constants.hx b/src/model/Constants.hx
index 6a2f615..074f2a5 100644
--- a/src/model/Constants.hx
+++ b/src/model/Constants.hx
@@ -29,10 +29,10 @@ class Constants {
     public static final LIST_SEPARATOR_COLOR:Int = 0xE1E3E4;
 
     // Fonts
-    public static final MONTSERRAT_LIGHT_300:String = "MontserratLight300";
-    public static final MONTSERRAT_REGULAR_400:String = "MontserratRegular400";
-    public static final MONTSERRAT_MEDIUM_500:String = "MontserratMedium500";
-    public static final MONTSERRAT_BOLD_700:String = "MontserratBold700";
+    public static final MONTSERRAT_LIGHT_300:String = "Montserrat Light";
+    public static final MONTSERRAT_REGULAR_400:String = "Montserrat Regular";
+    public static final MONTSERRAT_MEDIUM_500:String = "Montserrat Medium";
+    public static final MONTSERRAT_BOLD_700:String = "Montserrat Bold";
     public static final HIGH_SPIRITED:String = "HighSpirited";
 
     // Fonts sizes
diff --git a/src/view/RiderCardDrawer.hx b/src/view/RiderCardDrawer.hx
index dbc2450..a07ebf0 100644
--- a/src/view/RiderCardDrawer.hx
+++ b/src/view/RiderCardDrawer.hx
@@ -1,5 +1,6 @@
 package view;
 
+import openfl.Assets;
 import feathers.controls.ScrollContainer;
 import feathers.controls.Drawer;
 import feathers.events.FeathersEvent;
@@ -26,7 +27,6 @@ class RiderCardDrawer extends Drawer {
 		appModel = AppModelLocator.getInstance();
 
 		overlaySkin = new RectangleSkin(SolidColor(Constants.MAIN_COLOR3, 1));
-		swipeCloseEnabled = true;
 		swipeOpenEnabled = false;
 		autoSizeMode = STAGE;
 		pullableEdge = TOP;
@@ -48,6 +48,9 @@ class RiderCardDrawer extends Drawer {
 
 		// profile picture
 		ppal.source = Constants.PROFIL_PICTURES_PATH_512 + appModel.selectedRider.uid + ".jpg";
+
+		firstNameLabel.text = AppModelLocator.getInstance().selectedRider.firstName;
+		nameLabel.text = AppModelLocator.getInstance().selectedRider.name;
 		
 
 		openDrawer();
diff --git a/src/view/RiderCardDrawer.mxhx b/src/view/RiderCardDrawer.mxhx
index 87371f7..45f7fad 100644
--- a/src/view/RiderCardDrawer.mxhx
+++ b/src/view/RiderCardDrawer.mxhx
@@ -2,6 +2,7 @@
 <f:Drawer xmlns:mx="https://ns.mxhx.dev/2024/mxhx" 
           xmlns:f="https://ns.feathersui.com/mxhx" 
           xmlns:components="components.*">
+
   <f:ScrollContainer id="mainScrollContainer">
     <f:layout>
         <f:VerticalLayout horizontalAlign="JUSTIFY" 
@@ -27,7 +28,7 @@
       <f:backgroundSkin>
             <f:RectangleSkin>
                 <f:fill>
-                    <f:FillStyle.SolidColor color="0xFF00FF" alpha="1"/>
+                    <f:FillStyle.SolidColor color="0xDDDDDD" alpha="1"/>
                 </f:fill>
             </f:RectangleSkin>
         </f:backgroundSkin>
@@ -37,14 +38,24 @@
         </f:layout>
 
         <f:Label id="firstNameLabel" 
-                 text="Hello!" 
                  paddingLeft="0" 
                  paddingTop="0"
                  paddingRight="0"
                  paddingBottom="0"
                  embedFonts="true">
           <f:textFormat>
-              <f:TextFormat font="{Assets.getFont(model.Constants.MONTSERRAT_BOLD_700).fontName}" size="{model.Constants.FONT_SIZE_26}" color="{model.Constants.MAIN_COLOR1}"/>
+              <f:TextFormat font="Montserrat Bold" size="{model.Constants.FONT_SIZE_26}" color="{model.Constants.MAIN_COLOR1}"/>
+          </f:textFormat>
+        </f:Label>
+
+        <f:Label id="nameLabel" 
+                 paddingLeft="0" 
+                 paddingTop="0"
+                 paddingRight="0"
+                 paddingBottom="0"
+                 embedFonts="true">
+          <f:textFormat>
+              <f:TextFormat font="Montserrat Bold" size="{model.Constants.FONT_SIZE_26}" color="{model.Constants.MAIN_COLOR1}"/>
           </f:textFormat>
         </f:Label>