diff --git a/app/src/main/java/com/example/smox/caretaker/PatientList.kt b/app/src/main/java/com/example/smox/caretaker/PatientList.kt
index 675ab74..52529b6 100644
--- a/app/src/main/java/com/example/smox/caretaker/PatientList.kt
+++ b/app/src/main/java/com/example/smox/caretaker/PatientList.kt
@@ -132,4 +132,11 @@ class PatientList : AppCompatActivity() {
             }
         })
     }
+
+    fun back(view: View) {
+        super.onBackPressed();
+        overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+        val clickEffect = AnimationUtils.loadAnimation(this, R.anim.scale_up)
+        view.startAnimation(clickEffect)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/im_caretaker.png b/app/src/main/res/drawable/im_caretaker.png
index 93cce72..e338c82 100644
Binary files a/app/src/main/res/drawable/im_caretaker.png and b/app/src/main/res/drawable/im_caretaker.png differ
diff --git a/app/src/main/res/drawable/im_dosage.png b/app/src/main/res/drawable/im_dosage.png
index 757e3b8..c10b1e7 100644
Binary files a/app/src/main/res/drawable/im_dosage.png and b/app/src/main/res/drawable/im_dosage.png differ
diff --git a/app/src/main/res/drawable/im_history.png b/app/src/main/res/drawable/im_history.png
index 8f3a431..887ad71 100644
Binary files a/app/src/main/res/drawable/im_history.png and b/app/src/main/res/drawable/im_history.png differ
diff --git a/app/src/main/res/drawable/im_infromation.png b/app/src/main/res/drawable/im_infromation.png
deleted file mode 100644
index 73c59bc..0000000
Binary files a/app/src/main/res/drawable/im_infromation.png and /dev/null differ
diff --git a/app/src/main/res/drawable/im_patient.png b/app/src/main/res/drawable/im_patient.png
index c6d9d2d..e338c82 100644
Binary files a/app/src/main/res/drawable/im_patient.png and b/app/src/main/res/drawable/im_patient.png differ
diff --git a/app/src/main/res/drawable/im_schedule.png b/app/src/main/res/drawable/im_schedule.png
index c9c3c54..448cb8e 100644
Binary files a/app/src/main/res/drawable/im_schedule.png and b/app/src/main/res/drawable/im_schedule.png differ
diff --git a/app/src/main/res/drawable/rect_green.xml b/app/src/main/res/drawable/rect_green.xml
index 0ba1a62..752ea67 100644
--- a/app/src/main/res/drawable/rect_green.xml
+++ b/app/src/main/res/drawable/rect_green.xml
@@ -13,7 +13,7 @@
     <!-- Background -->
     <item>
         <shape>
-            <solid android:color="#D5EEBB" />
+            <solid android:color="@color/backgroud1" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/rect_green_10.xml b/app/src/main/res/drawable/rect_green_10.xml
index f643324..c1f0041 100644
--- a/app/src/main/res/drawable/rect_green_10.xml
+++ b/app/src/main/res/drawable/rect_green_10.xml
@@ -12,7 +12,7 @@
     <!-- Background -->
     <item>
         <shape>
-            <solid android:color="#D5EEBB" />
+            <solid android:color="@color/backgroud1" />
             <corners android:radius="10dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/rect_white.xml b/app/src/main/res/drawable/rect_white.xml
index f1b0040..e489f64 100644
--- a/app/src/main/res/drawable/rect_white.xml
+++ b/app/src/main/res/drawable/rect_white.xml
@@ -5,7 +5,7 @@
         <shape>
             <padding android:top="0.4dp" android:right="2dp" android:bottom="2dp" android:left="0.4dp" />
             <stroke android:color="#50000000" android:width="2dp" />
-            <corners android:radius="5dp" />
+            <corners android:radius="15dp" />
         </shape>
     </item>
 
@@ -13,7 +13,7 @@
     <item>
         <shape>
             <solid android:color="#FFF" />
-            <corners android:radius="5dp" />
+            <corners android:radius="15dp" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/c_confirm_patient.xml b/app/src/main/res/layout/c_confirm_patient.xml
index 2ae78a7..9733971 100644
--- a/app/src/main/res/layout/c_confirm_patient.xml
+++ b/app/src/main/res/layout/c_confirm_patient.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background4">
+    android:background="@color/background">
 
     <RelativeLayout
         android:layout_width="335dp"
@@ -18,7 +18,7 @@
             android:layout_centerHorizontal="true"
             android:alpha="0.9"
             android:fontFamily="@font/opensans"
-            android:text="Confirm your patient"
+            android:text="Konfirmasi Pasien"
             android:textColor="@color/brown"
             android:textSize="20dp"
             android:textStyle="bold">
@@ -32,7 +32,7 @@
             android:alpha="0.9"
             android:fontFamily="@font/opensans_italic"
             android:gravity="center_horizontal"
-            android:text="make sure the data below belongs to your patient"
+            android:text="Pastikan data dibawah ini sudah benar data pasien anda"
             android:textAlignment="center"
             android:textColor="@color/brown"
             android:textSize="18dp">
@@ -45,11 +45,11 @@
             android:layout_marginTop="135dp">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto"
-                android:text="Name"
+                android:text="Nama"
                 android:textColor="@color/brown"
                 android:textSize="18dp">
             </TextView>
@@ -81,11 +81,11 @@
             android:layout_marginTop="165dp">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto"
-                android:text="Birthday"
+                android:text="Tanggal Lahir"
                 android:textColor="@color/brown"
                 android:textSize="18dp">
             </TextView>
@@ -116,7 +116,7 @@
             android:layout_marginTop="195dp">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto"
@@ -151,11 +151,11 @@
             android:layout_marginTop="225dp">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto"
-                android:text="Call"
+                android:text="No. HP"
                 android:textColor="@color/brown"
                 android:textSize="18dp">
             </TextView>
@@ -192,7 +192,7 @@
                 android:textSize="20dp"
                 android:text="Confirm"
                 android:fontFamily="@font/opensans"
-                android:textColor="@color/brown"
+                android:textColor="@color/white"
                 android:alpha="0.8"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="5dp"/>
diff --git a/app/src/main/res/layout/c_connect.xml b/app/src/main/res/layout/c_connect.xml
index a273956..101916c 100644
--- a/app/src/main/res/layout/c_connect.xml
+++ b/app/src/main/res/layout/c_connect.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background4">
+    android:background="@color/background">
 
     <RelativeLayout
         android:layout_width="330dp"
@@ -18,7 +18,7 @@
             android:layout_centerHorizontal="true"
             android:alpha="0.9"
             android:fontFamily="@font/opensans"
-            android:text="Connect with your patient"
+            android:text="Hubungkan pasien"
             android:textColor="@color/brown"
             android:textSize="20dp"
             android:textStyle="bold">
@@ -31,7 +31,7 @@
             android:layout_marginTop="55dp"
             android:alpha="0.9"
             android:fontFamily="@font/opensans_italic"
-            android:text="by entering the patient's username"
+            android:text="Pasien yang akan anda pantau"
             android:textColor="@color/brown"
             android:textAlignment="center"
             android:textSize="18dp"
@@ -67,11 +67,11 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/rect_stroke_bottom"
                     android:fontFamily="@font/opensans"
-                    android:hint="Enter patient's username"
+                    android:hint="Masukkan username pasien"
                     android:paddingLeft="5dp"
                     android:textColor="@color/brown"
                     android:textColorHint="@color/green_dark"
-                    android:textSize="18dp"></EditText>
+                    android:textSize="16dp"></EditText>
             </RelativeLayout>
         </LinearLayout>
 
@@ -88,7 +88,7 @@
                 android:textSize="20dp"
                 android:text="Connect"
                 android:fontFamily="@font/opensans"
-                android:textColor="@color/brown"
+                android:textColor="@color/white"
                 android:alpha="0.8"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="5dp"/>
diff --git a/app/src/main/res/layout/c_dosage.xml b/app/src/main/res/layout/c_dosage.xml
index 4bc00f8..1819572 100644
--- a/app/src/main/res/layout/c_dosage.xml
+++ b/app/src/main/res/layout/c_dosage.xml
@@ -3,35 +3,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/background3"
+    android:background="@color/background"
     tools:context=".caretaker.Dosage">
 
     <RelativeLayout
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="13dp"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="DOSAGE"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="DOSAGE"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -55,7 +60,7 @@
                 android:layout_gravity="bottom|end"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="10dp"
-                android:backgroundTint="@color/green"
+                android:backgroundTint="@color/backgroud1"
                 android:src="@drawable/i_edit"
                 android:onClick="gotoSetOne">
             </com.google.android.material.floatingactionbutton.FloatingActionButton>
@@ -77,8 +82,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -91,7 +96,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="75dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -104,8 +109,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="130dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Instruction for use"
+                android:fontFamily="@font/opensans"
+                android:text="Aturan Konsumsi"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -118,7 +123,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="154dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -127,12 +132,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="190dp"
+                android:layout_marginLeft="190dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Dosage"
+                android:fontFamily="@font/opensans"
+                android:text="Dosis"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -146,7 +151,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -159,11 +164,11 @@
                 android:layout_marginLeft="165dp"
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
+                android:fontFamily="@font/roboto_thin"
                 android:text="TABLET"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
-                android:textStyle="bold">
+                android:textStyle="">
             </TextView>
 
 
@@ -186,7 +191,7 @@
                 android:layout_gravity="bottom|end"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="10dp"
-                android:backgroundTint="@color/green"
+                android:backgroundTint="@color/backgroud1"
                 android:src="@drawable/i_edit"
                 android:onClick="gotoSetTwo">
             </com.google.android.material.floatingactionbutton.FloatingActionButton>
@@ -209,8 +214,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -222,8 +227,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="130dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Instruction for use"
+                android:fontFamily="@font/opensans"
+                android:text="Aturan Konsumsi"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -236,7 +241,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="75dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -250,7 +255,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="154dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -259,12 +264,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="190dp"
+                android:layout_marginLeft="190dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Dosage"
+                android:fontFamily="@font/opensans"
+                android:text="Dosis"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -278,7 +283,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -291,7 +296,7 @@
                 android:layout_marginLeft="165dp"
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
+                android:fontFamily="@font/roboto_thin"
                 android:text="TABLET"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
diff --git a/app/src/main/res/layout/c_homepage.xml b/app/src/main/res/layout/c_homepage.xml
index 049c587..abec6f4 100644
--- a/app/src/main/res/layout/c_homepage.xml
+++ b/app/src/main/res/layout/c_homepage.xml
@@ -4,323 +4,378 @@
     tools:context=".caretaker.Homepage"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background2">
+    android:background="@color/background">
+
 
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/menu"
-        android:onClick="menu">
-        <ImageView
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="20dp"
-            android:src="@drawable/i_menu">
-        </ImageView>
-    </RelativeLayout>
 
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_marginTop="20dp"
+        android:layout_height="250dp"
         android:gravity="center"
-        android:id="@+id/welcome">
+        android:id="@+id/welcome"
+        android:background="@color/backgroud1">
 
-        <TextView
-            android:id="@+id/sa"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="@font/opensans_extrabold"
-            android:textColor="@color/white"
-            android:textSize="24dp" />
-    </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/uppercard"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:layout_height="180dp">
+            <RelativeLayout
+                android:id="@+id/data"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="visible">
 
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/menu"
+                    android:onClick="menu">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@drawable/i_menu">
+                    </ImageView>
+                </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/upcoming"
-        android:layout_width="320dp"
-        android:layout_height="145dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="120dp"
-        android:background="@drawable/rect_green">
+                <TextView
+                    android:id="@+id/sa"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:fontFamily="@font/opensans_extrabold"
+                    android:textColor="@color/white"
+                    android:textSize="24dp" />
 
-        <RelativeLayout
-            android:id="@+id/data"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="invisible">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="55dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="UPCOMING"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="20dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="UPCOMING"
-                android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/hour"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="70dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="64dp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/hour"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="35dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="64dp"
-                android:textStyle="bold" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="75dp"
+                    android:layout_marginLeft="75dp"
+                    android:layout_marginTop="100dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="."
+                    android:textColor="@color/brown"
+                    android:textSize="36dp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="95dp"
-                android:layout_marginLeft="95dp"
-                android:layout_marginTop="65dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="."
-                android:textColor="@color/brown"
-                android:textSize="36dp"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/ampm"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="85dp"
+                    android:layout_marginLeft="85dp"
+                    android:layout_marginTop="90dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="16dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/minute"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="85dp"
+                    android:layout_marginLeft="85dp"
+                    android:layout_marginTop="100dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="36dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/medicine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="70dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/dosage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="90dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/instruction"
+                    android:layout_width="125dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="125dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textAlignment="textEnd"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="Tidak ada jadwal"
+                    android:textAlignment="center"
+                    android:textColor="@color/brown"
+                    android:textSize="30dp"
+                    android:textStyle="bold"
+                    android:visibility="invisible" />
+            </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/nodata"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </RelativeLayout>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/schedulemenu"
+        android:layout_marginTop="200dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:background="@drawable/rect_white"
+        android:onClick="gotoSchedule">
+
+        <ImageView
+            android:alpha="0.9"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_schedule">
+        </ImageView>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
-                android:id="@+id/ampm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="105dp"
-                android:layout_marginLeft="105dp"
-                android:layout_marginTop="55dp"
-                android:alpha="0.9"
+                android:text="SCHEDULE"
                 android:fontFamily="@font/opensans"
-                android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="16dp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/minute"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="105dp"
-                android:layout_marginLeft="105dp"
-                android:layout_marginTop="65dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="36dp"
-                android:textStyle="bold" />
-
+                android:textStyle="bold"
+                android:id="@+id/sch1">
+            </TextView>
             <TextView
-                android:id="@+id/medicine"
+                android:layout_below="@id/sch1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
-                android:alpha="0.9"
+                android:alpha="0.8"
+                android:text="Jadwal konsumsi obat"
                 android:fontFamily="@font/opensans"
-                android:text="-"
                 android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold" />
+                android:textSize="16dp"
+                android:textStyle="">
+            </TextView>
+        </RelativeLayout>
 
-            <TextView
-                android:id="@+id/dosage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="40dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/rect_white"
+        android:layout_centerHorizontal="true"
+        android:id="@+id/dosagemenu"
+        android:layout_below="@id/schedulemenu"
+        android:onClick="gotoDosage">
 
+        <ImageView
+            android:layout_width="55dp"
+            android:alpha="0.9"
+            android:layout_height="55dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_dosage">
+        </ImageView>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
-                android:id="@+id/instruction"
-                android:layout_width="125dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="75dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
+                android:text="DOSAGE"
                 android:alpha="0.9"
                 android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textAlignment="textEnd"
                 android:textColor="@color/brown"
-                android:textSize="14dp" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/nodata"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
+                android:textSize="16dp"
+                android:textStyle="bold"
+                android:id="@+id/dsg1">
+            </TextView>
             <TextView
-                android:layout_width="match_parent"
+                android:layout_below="@id/dsg1"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:alpha="0.9"
+                android:alpha="0.8"
+                android:text="Dosis konsumsi obat"
                 android:fontFamily="@font/opensans"
-                android:text="No Data"
-                android:textAlignment="center"
                 android:textColor="@color/brown"
-                android:textSize="30dp"
-                android:textStyle="bold" />
-
+                android:textSize="16dp"
+                android:textStyle="">
+            </TextView>
         </RelativeLayout>
-
     </RelativeLayout>
 
-
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:gravity="center"
-        android:layout_below="@id/upcoming"
-        android:id="@+id/row1"
-        android:orientation="horizontal">
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_below="@id/dosagemenu"
+        android:background="@drawable/rect_white"
+        android:id="@+id/historymenu"
+        android:onClick="gotoHistory">
 
+        <ImageView
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:alpha="0.9"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_history">
+        </ImageView>
         <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:background="@drawable/rect_white"
-            android:onClick="gotoSchedule">
-
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_schedule">
-            </ImageView>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="115dp"
+                android:text="HISTORY"
                 android:alpha="0.9"
-                android:text="SCHEDULE"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="">
+                android:textSize="16dp"
+                android:textStyle="bold"
+                android:id="@+id/hst1">
             </TextView>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_marginLeft="20dp"
-            android:background="@drawable/rect_white"
-            android:id="@+id/schedule"
-            android:onClick="gotoDosage">
-
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_dosage">
-            </ImageView>
             <TextView
+                android:layout_below="@id/hst1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="115dp"
-                android:alpha="0.9"
-                android:text="DOSAGE"
-                android:fontFamily="@font/roboto"
+                android:alpha="0.8"
+                android:text="Riwayat konsumsi obat"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown"
-                android:textSize="14dp"
+                android:textSize="16dp"
                 android:textStyle="">
             </TextView>
         </RelativeLayout>
-    </LinearLayout>
-    <LinearLayout
+    </RelativeLayout>
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
-        android:layout_below="@id/row1"
-        android:id="@+id/row2">
-        <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_below="@id/schedule"
-            android:background="@drawable/rect_white"
-            android:id="@+id/history"
-            android:onClick="gotoHistory">
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_below="@id/historymenu"
+        android:background="@drawable/rect_white"
+        android:id="@+id/infromation"
+        android:onClick="gotoInformation"
+        android:visibility="visible">
 
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_history">
-            </ImageView>
+        <ImageView
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:alpha="0.9"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_patient">
+        </ImageView>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="115dp"
+                android:text="PATIENT"
                 android:alpha="0.9"
-                android:text="HISTORY"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="">
+                android:textSize="16dp"
+                android:textStyle="bold"
+                android:id="@+id/pnt1">
             </TextView>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_marginLeft="20dp"
-            android:background="@drawable/rect_white"
-            android:id="@+id/infromation"
-            android:onClick="gotoInformation"
-            android:visibility="visible">
-
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_patient">
-            </ImageView>
             <TextView
+                android:layout_below="@id/pnt1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="115dp"
-                android:alpha="0.9"
-                android:text="PATIENT"
-                android:fontFamily="@font/roboto"
+                android:alpha="0.8"
+                android:text="Pasien yang terhubung"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown"
-                android:textSize="14dp"
+                android:textSize="16dp"
                 android:textStyle="">
             </TextView>
         </RelativeLayout>
-    </LinearLayout>
+    </RelativeLayout>
+
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/c_menu.xml b/app/src/main/res/layout/c_menu.xml
index 7dc19e7..369808f 100644
--- a/app/src/main/res/layout/c_menu.xml
+++ b/app/src/main/res/layout/c_menu.xml
@@ -5,56 +5,60 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white1">
 
+    
+    
     <RelativeLayout
+        android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="240dp"
-        android:background="@color/green_dark"
-        android:padding="20dp"
-        android:id="@+id/header">
+        android:layout_height="200dp"
+        android:background="@color/backgroud1"
+        android:padding="20dp">
+
         <TextView
             android:id="@+id/fullname"
-            android:layout_marginTop="60dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Fullname"
-            android:textSize="48dp"
-            android:fontFamily="@font/roboto"
-            android:textColor="@color/green"
+            android:layout_marginTop="15dp"
+            android:fontFamily="@font/opensans"
+            android:text="Nama Lengkap"
+            android:textColor="@color/white"
+            android:textSize="45dp"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/birthday"
-            android:layout_marginTop="130dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Birthday"
-            android:textSize="18dp"
-            android:fontFamily="@font/roboto"
+            android:layout_marginTop="85dp"
+            android:fontFamily="@font/opensans"
+            android:text="Tanggal Lahir"
             android:textColor="@color/white"
-            android:textStyle="italic" />
+            android:textSize="18dp"
+            android:textStyle="" />
 
         <TextView
             android:id="@+id/email"
-            android:layout_marginTop="150dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Email"
-            android:textSize="18dp"
-            android:fontFamily="@font/roboto"
+            android:layout_marginTop="110dp"
+            android:fontFamily="@font/opensans"
+            android:text="Email"
             android:textColor="@color/white"
-            android:textStyle="italic" />
+            android:textSize="18dp"
+            android:textStyle="" />
 
         <TextView
             android:id="@+id/phoneNumber"
-            android:layout_marginTop="175dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Phone"
-            android:textSize="18dp"
-            android:fontFamily="@font/roboto"
+            android:layout_marginTop="135dp"
+            android:fontFamily="@font/opensans"
+            android:text="No. Hp"
             android:textColor="@color/white"
-            android:textStyle="italic" />
+            android:textSize="18dp"
+            android:textStyle="" />
 
+        
     </RelativeLayout>
 
     <RelativeLayout
@@ -81,40 +85,29 @@
                 android:text="Logout"
                 android:layout_marginLeft="10dp"
                 android:textSize="18dp"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown">
             </TextView>
         </LinearLayout>
 
     </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="YOUR ACCOUNT"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="13dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
-
-
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="12dp"
         android:onClick="backtoHome">
         <ImageView
             android:id="@+id/account"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="15dp"
             android:src="@drawable/i_back_right"
             android:alpha="0.9">
         </ImageView>
     </RelativeLayout>
 
+
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/c_patient.xml b/app/src/main/res/layout/c_patient.xml
index 03065fb..a933970 100644
--- a/app/src/main/res/layout/c_patient.xml
+++ b/app/src/main/res/layout/c_patient.xml
@@ -3,50 +3,47 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/background3"
+    android:background="@color/background"
     tools:context=".caretaker.Patient">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="13dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="PATIENTS"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
-
-    <ImageView
-        android:id="@+id/picture"
-        android:layout_width="180dp"
-        android:layout_height="180dp"
-        android:layout_marginTop="75dp"
-        android:layout_centerHorizontal="true"
-        android:src="@drawable/im_patient">
-    </ImageView>
-
+        android:id="@+id/up"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="PASIEN"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
+    
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_below="@id/picture"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/up"
+        android:layout_marginTop="20dp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/rect_white"
@@ -57,143 +54,143 @@
             android:layout_height="wrap_content"
             android:padding="20dp">
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
+                android:id="@+id/row1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
-                    android:text="Name"
+                    android:fontFamily="@font/opensans"
+                    android:text="Nama"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
 
                 <TextView
                     android:id="@+id/fullname"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="fullname"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp"></TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="30dp">
+                android:id="@+id/row2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/row1"
+                android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
-                    android:text="Birthday"
+                    android:fontFamily="@font/opensans"
+                    android:text="Tanggal lahir"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:id="@+id/birthday"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="birthday"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp"></TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="60dp">
+                android:id="@+id/row3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/row2"
+                android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text="Email"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:id="@+id/email"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="email"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp"></TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="90dp">
+                android:id="@+id/row4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/row3"
+                android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
-                    android:text="Call"
+                    android:fontFamily="@font/opensans"
+                    android:text="No. HP"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:id="@+id/phoneNumber"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="phoneNumber"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp"></TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
         </RelativeLayout>
@@ -218,7 +215,7 @@
             android:alpha="0.8"
             android:fontFamily="@font/opensans"
             android:text="Other Patients"
-            android:textColor="@color/brown"
+            android:textColor="@color/white"
             android:textSize="16dp" />
     </RelativeLayout>
 
@@ -241,7 +238,7 @@
             android:alpha="0.8"
             android:fontFamily="@font/opensans"
             android:text="Add new patient"
-            android:textColor="@color/brown"
+            android:textColor="@color/white"
             android:textSize="16dp" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/c_patients_card.xml b/app/src/main/res/layout/c_patients_card.xml
index a01d78a..799bafc 100644
--- a/app/src/main/res/layout/c_patients_card.xml
+++ b/app/src/main/res/layout/c_patients_card.xml
@@ -19,15 +19,15 @@
         <LinearLayout
             android:id="@+id/row1"
             android:layout_width="match_parent"
-            android:layout_height="25dp"
+            android:layout_height="wrap_content"
             android:layout_centerHorizontal="true">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Name"
+                android:fontFamily="@font/opensans"
+                android:text="Nama"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
 
@@ -35,7 +35,7 @@
                 android:layout_width="10dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text=":"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
@@ -45,7 +45,7 @@
                 android:id="@+id/fullname"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:tag="fullname"
                 android:textColor="@color/green_dark"
                 android:textSize="18dp" />
@@ -54,16 +54,16 @@
         <LinearLayout
             android:id="@+id/row2"
             android:layout_width="match_parent"
-            android:layout_height="25dp"
+            android:layout_height="wrap_content"
             android:layout_below="@id/row1"
             android:layout_centerHorizontal="true">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Birthday"
+                android:fontFamily="@font/opensans"
+                android:text="Tanggal lahir"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
 
@@ -71,7 +71,7 @@
                 android:layout_width="10dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text=":"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
@@ -80,7 +80,7 @@
                 android:id="@+id/birthday"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:tag="birthday"
                 android:textColor="@color/green_dark"
                 android:textSize="18dp" />
@@ -89,15 +89,15 @@
         <LinearLayout
             android:id="@+id/row3"
             android:layout_width="match_parent"
-            android:layout_height="25dp"
+            android:layout_height="wrap_content"
             android:layout_below="@id/row2"
             android:layout_centerHorizontal="true">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="Email"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
@@ -106,7 +106,7 @@
                 android:layout_width="10dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text=":"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
@@ -115,7 +115,7 @@
                 android:id="@+id/email"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:tag="email"
                 android:textColor="@color/green_dark"
                 android:textSize="18dp" />
@@ -124,16 +124,16 @@
         <LinearLayout
             android:id="@+id/row4"
             android:layout_width="match_parent"
-            android:layout_height="25dp"
+            android:layout_height="wrap_content"
             android:layout_below="@id/row3"
             android:layout_centerHorizontal="true">
 
             <TextView
-                android:layout_width="70dp"
+                android:layout_width="120dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Call"
+                android:fontFamily="@font/opensans"
+                android:text="No. HP"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
 
@@ -141,7 +141,7 @@
                 android:layout_width="10dp"
                 android:layout_height="wrap_content"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text=":"
                 android:textColor="@color/brown"
                 android:textSize="18dp" />
@@ -150,7 +150,7 @@
                 android:id="@+id/phoneNumber"
                 android:layout_width="210dp"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:tag="phoneNumber"
                 android:textColor="@color/green_dark"
                 android:textSize="18dp" />
diff --git a/app/src/main/res/layout/c_patients_list.xml b/app/src/main/res/layout/c_patients_list.xml
index 6111503..b9421a2 100644
--- a/app/src/main/res/layout/c_patients_list.xml
+++ b/app/src/main/res/layout/c_patients_list.xml
@@ -3,35 +3,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/background3"
+    android:background="@color/background"
     tools:context=".caretaker.PatientList">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="back">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="back">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="PATIENTS"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="DAFTAR PASIEN"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -50,8 +55,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="20dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Click the card to choose patient."
+                android:fontFamily="@font/opensans"
+                android:text="Klik kartu pasien untuk memilih"
                 android:textColor="@color/brown"
                 android:textSize="18dp"></TextView>
 
diff --git a/app/src/main/res/layout/c_schedule.xml b/app/src/main/res/layout/c_schedule.xml
index 1745923..1d8d52a 100644
--- a/app/src/main/res/layout/c_schedule.xml
+++ b/app/src/main/res/layout/c_schedule.xml
@@ -3,35 +3,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/background3"
+    android:background="@color/background"
     tools:context=".caretaker.Schedule">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="SCHEDULE"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SCHEDULE"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -56,7 +61,7 @@
                 android:layout_gravity="bottom|end"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="10dp"
-                android:backgroundTint="@color/green"
+                android:backgroundTint="@color/backgroud1"
                 android:src="@drawable/i_edit"
                 android:onClick="gotoSetOne">
             </com.google.android.material.floatingactionbutton.FloatingActionButton>
@@ -78,8 +83,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="40dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -92,7 +97,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="65dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -105,8 +110,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="110dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Period"
+                android:fontFamily="@font/opensans"
+                android:text="Target"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -119,7 +124,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="130dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -133,7 +138,7 @@
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto_thin_italic"
-                android:text="*This term can change according to the patient's condition"
+                android:text="*Dapat berubah-ubah disesuaikan dengan kondisi pasien"
                 android:textColor="@color/brown"
                 android:textSize="11dp"
                 android:textStyle="">
@@ -142,12 +147,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="155dp"
+                android:layout_marginLeft="155dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Interval"
+                android:fontFamily="@font/opensans"
+                android:text="Rentang Jadwal"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -161,7 +166,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="70dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -170,15 +175,15 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="155dp"
-                android:layout_marginLeft="165dp"
+                android:layout_marginStart="170dp"
+                android:layout_marginLeft="170dp"
                 android:layout_marginTop="160dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
-                android:text="MINUTES"
+                android:alpha="0.8"
+                android:fontFamily="@font/roboto_thin"
+                android:text="MENIT"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
-                android:textStyle="bold">
+                android:textStyle="">
             </TextView>
 
         </RelativeLayout>
@@ -200,7 +205,7 @@
                 android:layout_gravity="bottom|end"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="10dp"
-                android:backgroundTint="@color/green"
+                android:backgroundTint="@color/backgroud1"
                 android:src="@drawable/i_edit"
                 android:onClick="gotoSetTwo">
             </com.google.android.material.floatingactionbutton.FloatingActionButton>
@@ -223,8 +228,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="40dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -237,7 +242,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="65dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -250,8 +255,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="110dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Period"
+                android:fontFamily="@font/opensans"
+                android:text="Target"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -278,7 +283,7 @@
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto_thin_italic"
-                android:text="*This term can change according to the patient's condition"
+                android:text="*Dapat berubah-ubah disesuaikan dengan kondisi pasien"
                 android:textColor="@color/brown"
                 android:textSize="11dp"
                 android:textStyle="">
@@ -287,12 +292,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="155dp"
+                android:layout_marginLeft="155dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Interval"
+                android:fontFamily="@font/opensans"
+                android:text="Rentang Jadwal"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -306,7 +311,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="70dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -315,12 +320,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="155dp"
-                android:layout_marginLeft="165dp"
+                android:layout_marginStart="170dp"
+                android:layout_marginLeft="170dp"
                 android:layout_marginTop="160dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
-                android:text="MINUTES"
+                android:alpha="0.8"
+                android:fontFamily="@font/roboto_thin"
+                android:text="MENIT"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
                 android:textStyle="bold">
diff --git a/app/src/main/res/layout/c_set.xml b/app/src/main/res/layout/c_set.xml
index 5104fb2..26299d5 100644
--- a/app/src/main/res/layout/c_set.xml
+++ b/app/src/main/res/layout/c_set.xml
@@ -2,81 +2,64 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background3">
+    android:background="@color/background">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ATUR PROSEDUR"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
     </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="SET"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="55dp">
         <RelativeLayout
-            android:layout_width="325dp"
-            android:layout_height="540dp"
+            android:layout_width="350dp"
+            android:layout_height="550dp"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:background="@drawable/rect_white"
             android:id="@+id/adpatient">
 
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/save_slot1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:layout_gravity="bottom|end"
-                android:layout_marginRight="10dp"
-                android:layout_marginBottom="10dp"
-                android:backgroundTint="@color/green"
-                android:src="@drawable/i_save"
-                android:onClick="save">
-            </com.google.android.material.floatingactionbutton.FloatingActionButton>
-
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="540dp"
-                android:layout_alignParentRight="true"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:src="@drawable/background_rect_long">
-            </ImageView>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="110dp"
-                android:layout_marginLeft="110dp"
+                android:layout_centerHorizontal="true"
                 android:layout_marginTop="15dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="SLOT 1"
                 android:textColor="@color/brown"
                 android:textSize="20dp"
+                android:textStyle="bold"
                 android:id="@+id/slot">
             </TextView>
 
@@ -85,23 +68,22 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="50dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:layout_marginTop="60dp"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
 
             <EditText
                 android:id="@+id/medicine_name"
-                android:layout_width="240dp"
+                android:layout_width="match_parent"
                 android:layout_height="32dp"
-                android:layout_marginStart="20dp"
+                android:layout_marginTop="85dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="75dp"
+                android:layout_marginRight="20dp"
                 android:background="@drawable/rect_stroke"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:paddingLeft="5dp"
                 android:textColor="@color/brown"
                 android:textSize="14dp"></EditText>
@@ -111,23 +93,22 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="120dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Interval"
+                android:layout_marginTop="130dp"
+                android:fontFamily="@font/opensans"
+                android:text="Rentang jadwal"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
 
             <EditText
                 android:id="@+id/interval"
-                android:layout_width="190dp"
+                android:layout_width="match_parent"
                 android:layout_height="32dp"
-                android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="145dp"
+                android:layout_marginRight="75dp"
+                android:layout_marginTop="155dp"
                 android:background="@drawable/rect_stroke"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:inputType="number"
                 android:paddingLeft="5dp"
                 android:textColor="@color/brown"
@@ -136,12 +117,11 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="60dp"
-                android:layout_marginEnd="60dp"
-                android:layout_marginTop="150dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginTop="160dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Minutes"
+                android:fontFamily="@font/opensans"
+                android:text="Menit"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
                 android:layout_alignParentRight="true">
@@ -152,23 +132,22 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="190dp"
+                android:layout_marginTop="200dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Dosage"
+                android:fontFamily="@font/opensans"
+                android:text="Dosis"
                 android:textColor="@color/green_dark"
-                android:textSize="14dp">
-            </TextView>
+                android:textSize="14dp"></TextView>
 
             <EditText
                 android:id="@+id/dosage"
-                android:layout_width="190dp"
+                android:layout_width="match_parent"
                 android:layout_height="32dp"
-                android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="215dp"
+                android:layout_marginRight="75dp"
+                android:layout_marginTop="225dp"
                 android:background="@drawable/rect_stroke"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:inputType="number"
                 android:paddingLeft="5dp"
                 android:textColor="@color/brown"
@@ -177,11 +156,10 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="60dp"
-                android:layout_marginEnd="60dp"
-                android:layout_marginTop="220dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginTop="230dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="Tablet"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -193,23 +171,23 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="260dp"
+                android:layout_marginTop="270dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Instruction for use"
+                android:fontFamily="@font/opensans"
+                android:text="Aturan konsumsi"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
 
             <EditText
                 android:id="@+id/instruction"
-                android:layout_width="240dp"
+                android:layout_width="match_parent"
                 android:layout_height="32dp"
-                android:layout_marginStart="20dp"
+                android:layout_marginRight="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="285dp"
+                android:layout_marginTop="295dp"
                 android:background="@drawable/rect_stroke"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:paddingLeft="5dp"
                 android:textColor="@color/brown"
                 android:textSize="14dp"></EditText>
@@ -219,9 +197,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="330dp"
+                android:layout_marginTop="340dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="Start Time"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
@@ -229,13 +207,13 @@
 
             <EditText
                 android:id="@+id/starttime"
-                android:layout_width="120dp"
+                android:layout_width="match_parent"
                 android:layout_height="32dp"
-                android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="355dp"
+                android:layout_marginRight="150dp"
+                android:layout_marginTop="365dp"
                 android:background="@drawable/rect_stroke"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:paddingLeft="5dp"
                 android:textColor="@color/brown"
                 android:textSize="14dp"></EditText>
@@ -245,9 +223,8 @@
                 android:layout_width="110dp"
                 android:layout_height="35dp"
                 android:layout_alignParentRight="true"
-                android:layout_marginEnd="60dp"
-                android:layout_marginRight="60dp"
-                android:layout_marginTop="353dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginTop="363dp"
                 android:background="@drawable/rect_green"
                 android:onClick="getTime">
                 <TextView
@@ -258,7 +235,7 @@
                     android:alpha="0.9"
                     android:fontFamily="@font/opensans"
                     android:text="Get Current Time"
-                    android:textColor="@color/brown"
+                    android:textColor="@color/white"
                     android:textSize="12dp" />
             </RelativeLayout>
 
@@ -267,23 +244,23 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="400dp"
+                android:layout_marginTop="410dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Period"
+                android:fontFamily="@font/opensans"
+                android:text="Target"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
 
             <EditText
                 android:id="@+id/period"
-                android:layout_width="120dp"
+                android:layout_width="match_parent"
                 android:layout_height="37dp"
-                android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="425dp"
+                android:layout_marginRight="150dp"
+                android:layout_marginTop="435dp"
                 android:background="@drawable/rect_stroke"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:inputType="number"
                 android:paddingLeft="5dp"
                 android:textColor="@color/brown"
@@ -293,27 +270,47 @@
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
                 android:layout_width="110dp"
-                android:layout_height="42dp"
+                android:layout_height="50dp"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="420dp"
-                android:layout_marginEnd="60dp"
-                android:layout_marginRight="60dp">
+                android:layout_marginTop="425dp"
+                android:layout_marginEnd="20dp">
                 <AutoCompleteTextView
                     android:id="@+id/autoCompleteTextView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="none"
-                    android:text="Days"
-                    android:textSize="14dp"
+                    android:text="Hari"
+                    android:textSize="12dp"
                     android:textColor="@color/brown"/>
             </com.google.android.material.textfield.TextInputLayout>
 
             <RelativeLayout
-                android:layout_width="220dp"
+                android:layout_width="180dp"
                 android:layout_height="35dp"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="482dp"
+                android:layout_marginTop="495dp"
+                android:background="@drawable/rect_green"
+                android:id="@+id/save_slot1"
+                android:onClick="save">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerHorizontal="true"
+                    android:gravity="center_vertical"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="Simpan"
+                    android:textColor="@color/white"
+                    android:textSize="12dp" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="110dp"
+                android:layout_height="35dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="20dp"
+                android:layout_marginTop="495dp"
                 android:background="@drawable/rect_green"
                 android:onClick="markAsDone">
                 <TextView
@@ -323,8 +320,8 @@
                     android:gravity="center_vertical"
                     android:alpha="0.9"
                     android:fontFamily="@font/opensans"
-                    android:text="Mark as Done"
-                    android:textColor="@color/brown"
+                    android:text="Prosedur selesai"
+                    android:textColor="@color/white"
                     android:textSize="12dp" />
             </RelativeLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/confirm.xml b/app/src/main/res/layout/confirm.xml
index 129a335..9eb3c45 100644
--- a/app/src/main/res/layout/confirm.xml
+++ b/app/src/main/res/layout/confirm.xml
@@ -3,105 +3,104 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background1"
+    android:background="@color/background"
     tools:context=".ConfirmRole">
 
    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center">
+
+
        <RelativeLayout
            android:id="@+id/adpatient"
            android:layout_width="270dp"
-           android:layout_height="150dp"
+           android:layout_height="80dp"
            android:layout_centerHorizontal="true"
            android:background="@drawable/rect_white"
            android:clickable="true"
+           android:padding="10dp"
            android:onClick="pickPatient">
 
-           <ImageView
-               android:layout_width="100dp"
-               android:layout_height="100dp"
-               android:layout_centerVertical="true"
-               android:layout_marginLeft="10dp"
-               android:src="@drawable/im_patient">
-           </ImageView>
-
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:layout_marginStart="115dp"
-               android:layout_marginLeft="115dp"
-               android:layout_marginTop="25dp"
+               android:layout_centerHorizontal="true"
                android:alpha="0.9"
                android:fontFamily="@font/opensans"
-               android:text="AS PATIENT"
-               android:textColor="@color/brown"
-               android:textSize="14dp"
+               android:text="PATIENT"
+               android:textColor="@color/green_dark"
+               android:textSize="18dp"
                android:textStyle="bold">
            </TextView>
 
            <TextView
-               android:layout_width="144dp"
+               android:layout_width="180dp"
                android:layout_height="70dp"
-               android:layout_marginStart="115dp"
-               android:layout_marginLeft="115dp"
-               android:layout_marginTop="52dp"
+               android:layout_marginTop="30dp"
                android:alpha="0.9"
                android:fontFamily="@font/opensans"
-               android:text="The one who takes the medicine. Can’t manage the schedule and the dosage."
+               android:layout_centerHorizontal="true"
+               android:text="Yang mengonsumsi obat"
                android:textColor="@color/brown"
-               android:textSize="12dp"
+               android:textSize="14dp"
+               android:textAlignment="center"
                android:textStyle="">
            </TextView>
        </RelativeLayout>
 
        <RelativeLayout
            android:layout_width="270dp"
-           android:layout_height="150dp"
+           android:layout_height="80dp"
            android:layout_below="@id/adpatient"
            android:layout_centerHorizontal="true"
            android:layout_marginTop="30dp"
            android:background="@drawable/rect_white"
            android:clickable="true"
+           android:padding="10dp"
            android:onClick="pickCaretaker">
 
-           <ImageView
-               android:layout_width="100dp"
-               android:layout_height="100dp"
-               android:layout_centerVertical="true"
-               android:layout_marginLeft="10dp"
-               android:src="@drawable/im_caretaker">
-           </ImageView>
-
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:layout_marginStart="115dp"
-               android:layout_marginLeft="115dp"
-               android:layout_marginTop="25dp"
+               android:layout_centerHorizontal="true"
                android:alpha="0.9"
                android:fontFamily="@font/opensans"
-               android:text="AS CARETAKER"
-               android:textColor="@color/brown"
-               android:textSize="14dp"
+               android:text="CARETAKER"
+               android:textColor="@color/green_dark"
+               android:textSize="18dp"
                android:textStyle="bold">
            </TextView>
 
            <TextView
-               android:layout_width="144dp"
+               android:layout_width="260dp"
                android:layout_height="70dp"
-               android:layout_marginStart="115dp"
-               android:layout_marginLeft="115dp"
-               android:layout_marginTop="52dp"
+               android:layout_marginTop="30dp"
                android:alpha="0.9"
                android:fontFamily="@font/opensans"
-               android:text="The keeper. This person manages the schedule and the dosage for the patient."
+               android:layout_centerHorizontal="true"
+               android:text="Pengontrol dan penjaga pasien"
                android:textColor="@color/brown"
-               android:textSize="12dp"
+               android:textSize="14dp"
+               android:textAlignment="center"
                android:textStyle="">
            </TextView>
        </RelativeLayout>
+
+
+
    </RelativeLayout>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:alpha="0.9"
+        android:fontFamily="@font/opensans"
+        android:text="Pilih peran anda :"
+        android:textColor="@color/brown"
+        android:textSize="20dp"
+        android:layout_marginTop="150dp"
+        android:textStyle="">
+    </TextView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dropdown_list.xml b/app/src/main/res/layout/dropdown_list.xml
index 807e2b8..dc4df61 100644
--- a/app/src/main/res/layout/dropdown_list.xml
+++ b/app/src/main/res/layout/dropdown_list.xml
@@ -2,7 +2,7 @@
     android:id="@+id/textView"
     android:layout_width="200dp"
     android:layout_height="wrap_content"
-    android:text="TextView"
+    android:text="Hari"
     android:padding="15sp"
     android:textColor="@color/brown"
     android:textSize="14sp"
diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml
index 4d9ccae..6bc9e79 100644
--- a/app/src/main/res/layout/history.xml
+++ b/app/src/main/res/layout/history.xml
@@ -3,34 +3,39 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/background3">
+    android:background="@color/background">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="HISTORY"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="12dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="RIAWAYAT"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <androidx.viewpager.widget.ViewPager
         android:layout_width="320dp"
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index b628dbc..248b737 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -28,7 +28,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="12dp"
         android:alpha="0.9"
-        android:fontFamily="@font/roboto"
+        android:fontFamily="@font/opensans"
         android:textColor="@color/white"
         android:textSize="18dp" />
 
@@ -38,7 +38,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="70dp"
         android:alpha="0.9"
-        android:fontFamily="@font/roboto"
+        android:fontFamily="@font/opensans"
         android:text="Your Achievement"
         android:textColor="@color/brown"
         android:textSize="18dp"
@@ -59,7 +59,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="15dp"
             android:alpha="0.9"
-            android:fontFamily="@font/roboto"
+            android:fontFamily="@font/opensans"
             android:text="14"
             android:textColor="@color/brown"
             android:textSize="80dp" />
diff --git a/app/src/main/res/layout/history_fragment1.xml b/app/src/main/res/layout/history_fragment1.xml
index 5260ee4..72e6f76 100644
--- a/app/src/main/res/layout/history_fragment1.xml
+++ b/app/src/main/res/layout/history_fragment1.xml
@@ -18,8 +18,8 @@
             android:layout_marginLeft="20dp"
             android:layout_marginTop="20dp"
             android:alpha="0.9"
-            android:fontFamily="@font/roboto"
-            android:text="The Medicine"
+            android:fontFamily="@font/opensans"
+            android:text="Nama Obat"
             android:textColor="@color/green_dark"
             android:textSize="14dp">
         </TextView>
@@ -31,7 +31,7 @@
             android:layout_marginLeft="20dp"
             android:layout_marginTop="45dp"
             android:alpha="0.9"
-            android:fontFamily="@font/roboto"
+            android:fontFamily="@font/opensans"
             android:tag="name1"
             android:text="-"
             android:textColor="@color/brown"
@@ -47,8 +47,8 @@
             android:layout_marginTop="20dp"
             android:textAlignment="textEnd"
             android:alpha="0.9"
-            android:fontFamily="@font/roboto"
-            android:text="Period"
+            android:fontFamily="@font/opensans"
+            android:text="Target"
             android:textColor="@color/green_dark"
             android:textSize="14dp"
             android:gravity="end">
@@ -62,7 +62,7 @@
             android:layout_marginEnd="20dp"
             android:layout_marginRight="20dp"
             android:alpha="0.9"
-            android:fontFamily="@font/roboto"
+            android:fontFamily="@font/opensans"
             android:gravity="end"
             android:tag="period1"
             android:text="-"
@@ -73,11 +73,11 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="90dp"
+            android:layout_marginTop="100dp"
             android:textAlignment="textEnd"
             android:alpha="0.9"
-            android:fontFamily="@font/roboto"
-            android:text="Your Achievement"
+            android:fontFamily="@font/opensans"
+            android:text="Riwayat Konsumsi"
             android:textColor="@color/green_dark"
             android:textSize="14dp"
             android:gravity="end"
@@ -88,7 +88,7 @@
             android:layout_centerHorizontal="true"
             android:layout_width="200dp"
             android:layout_height="200dp"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="140dp"
             android:background="@drawable/background_circle">
 
             <TextView
@@ -97,7 +97,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="15dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:tag="days1"
                 android:text="-"
                 android:textColor="@color/brown"
@@ -105,27 +105,16 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="DAYS"
+                android:text="HARI"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="110dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
+                android:fontFamily="@font/roboto_thin"
                 android:textColor="@color/brown"
                 android:textSize="36dp">
             </TextView>
         </RelativeLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="30dp"
-            android:alpha="0.9"
-            android:fontFamily="@font/roboto_light"
-            android:text="Click the card for the detail"
-            android:textColor="@color/brown"
-            android:textSize="14dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true">
-        </TextView>
+
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_fragment2.xml b/app/src/main/res/layout/history_fragment2.xml
index a033a4d..46783c5 100644
--- a/app/src/main/res/layout/history_fragment2.xml
+++ b/app/src/main/res/layout/history_fragment2.xml
@@ -19,7 +19,7 @@
             android:layout_marginTop="20dp"
             android:alpha="0.9"
             android:fontFamily="@font/roboto"
-            android:text="The Medicine"
+            android:text="Nama Obat"
             android:textColor="@color/green_dark"
             android:textSize="14dp">
         </TextView>
@@ -48,7 +48,7 @@
             android:textAlignment="textEnd"
             android:alpha="0.9"
             android:fontFamily="@font/roboto"
-            android:text="Period"
+            android:text="Target"
             android:textColor="@color/green_dark"
             android:textSize="14dp"
             android:gravity="end">
@@ -73,11 +73,11 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="90dp"
+            android:layout_marginTop="100dp"
             android:textAlignment="textEnd"
             android:alpha="0.9"
             android:fontFamily="@font/roboto"
-            android:text="Your Achievement"
+            android:text="Riwayat Konsumsi"
             android:textColor="@color/green_dark"
             android:textSize="14dp"
             android:gravity="end"
@@ -88,7 +88,7 @@
             android:layout_centerHorizontal="true"
             android:layout_width="200dp"
             android:layout_height="200dp"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="140dp"
             android:background="@drawable/background_circle">
 
             <TextView
@@ -97,7 +97,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="15dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:tag="days2"
                 android:text="-"
                 android:textColor="@color/brown"
@@ -105,27 +105,16 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="DAYS"
+                android:text="HARI"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="110dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
+                android:fontFamily="@font/roboto_thin"
                 android:textColor="@color/brown"
                 android:textSize="36dp">
             </TextView>
         </RelativeLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="30dp"
-            android:alpha="0.9"
-            android:fontFamily="@font/roboto_light"
-            android:text="Click the card for the detail"
-            android:textColor="@color/brown"
-            android:textSize="14dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true">
-        </TextView>
+
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/p_caretaker.xml b/app/src/main/res/layout/p_caretaker.xml
index b5badf1..33920d5 100644
--- a/app/src/main/res/layout/p_caretaker.xml
+++ b/app/src/main/res/layout/p_caretaker.xml
@@ -2,49 +2,48 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background3">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/background"
+    tools:context=".caretaker.Patient">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="CARETAKER"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="12dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
-
-    <ImageView
-        android:id="@+id/picture"
-        android:layout_width="180dp"
-        android:layout_height="180dp"
-        android:layout_marginTop="75dp"
-        android:layout_centerHorizontal="true"
-        android:src="@drawable/im_caretaker">
-    </ImageView>
+        android:id="@+id/up"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="CARETAKER"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_below="@id/picture"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/up"
+        android:layout_marginTop="20dp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:background="@drawable/rect_white"
@@ -55,150 +54,147 @@
             android:layout_height="wrap_content"
             android:padding="20dp">
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
+                android:id="@+id/row1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
-                    android:text="Name"
+                    android:fontFamily="@font/opensans"
+                    android:text="Nama"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
 
                 <TextView
                     android:id="@+id/caretakerName"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="fullname"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="30dp">
+                android:id="@+id/row2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/row1"
+                android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
-                    android:text="Birthday"
+                    android:fontFamily="@font/opensans"
+                    android:text="Tanggal lahir"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:id="@+id/caretakerBirthday"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="birthday"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="60dp">
+                android:id="@+id/row3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/row2"
+                android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text="Email"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:id="@+id/caretakerEmail"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="email"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="290dp"
-                android:layout_height="25dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="90dp">
+                android:id="@+id/row4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/row3"
+                android:layout_centerHorizontal="true">
 
                 <TextView
-                    android:layout_width="70dp"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
-                    android:text="Call"
+                    android:fontFamily="@font/opensans"
+                    android:text="No. HP"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:layout_width="10dp"
                     android:layout_height="wrap_content"
                     android:alpha="0.9"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
                     android:text=":"
                     android:textColor="@color/brown"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
 
                 <TextView
                     android:id="@+id/caretakerPhone"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:fontFamily="@font/roboto"
+                    android:fontFamily="@font/opensans"
+                    android:tag="phoneNumber"
                     android:textColor="@color/green_dark"
-                    android:textSize="18dp">
-                </TextView>
+                    android:textSize="18dp" />
             </LinearLayout>
 
         </RelativeLayout>
     </RelativeLayout>
 
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/p_dosage.xml b/app/src/main/res/layout/p_dosage.xml
index 22d491c..f3ebfcf 100644
--- a/app/src/main/res/layout/p_dosage.xml
+++ b/app/src/main/res/layout/p_dosage.xml
@@ -3,35 +3,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/background3"
-    tools:context=".patient.Dosage">
+    android:background="@color/background"
+    tools:context=".caretaker.Dosage">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="DOSAGE"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="12dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="DOSAGE"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -46,6 +51,7 @@
             android:background="@drawable/rect_white"
             android:id="@+id/adpatient">
 
+
             <ImageView
                 android:layout_width="35dp"
                 android:layout_height="250dp"
@@ -62,8 +68,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -76,26 +82,12 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="75dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
                 android:textStyle="bold"></TextView>
 
-            <View
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="75dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="MIRTAZAPINE"
-                android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold">
-            </View>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -103,8 +95,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="130dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Procedure"
+                android:fontFamily="@font/opensans"
+                android:text="Aturan Konsumsi"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -117,7 +109,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="154dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -126,12 +118,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="190dp"
+                android:layout_marginLeft="190dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Dosage"
+                android:fontFamily="@font/opensans"
+                android:text="Dosis"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -145,7 +137,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -158,11 +150,11 @@
                 android:layout_marginLeft="165dp"
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
+                android:fontFamily="@font/roboto_thin"
                 android:text="TABLET"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
-                android:textStyle="bold">
+                android:textStyle="">
             </TextView>
 
 
@@ -176,6 +168,7 @@
             android:layout_marginTop="25dp"
             android:background="@drawable/rect_white">
 
+
             <ImageView
                 android:layout_width="35dp"
                 android:layout_height="250dp"
@@ -185,6 +178,7 @@
                 android:src="@drawable/background_rect">
             </ImageView>
 
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -192,38 +186,38 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
 
             <TextView
-                android:id="@+id/name2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="75dp"
+                android:layout_marginTop="130dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold"></TextView>
+                android:fontFamily="@font/opensans"
+                android:text="Aturan Konsumsi"
+                android:textColor="@color/green_dark"
+                android:textSize="14dp">
+            </TextView>
 
             <TextView
+                android:id="@+id/name2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginLeft="20dp"
-                android:layout_marginTop="130dp"
+                android:layout_marginTop="75dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Procedure"
-                android:textColor="@color/green_dark"
-                android:textSize="14dp">
-            </TextView>
+                android:fontFamily="@font/opensans"
+                android:text="-"
+                android:textColor="@color/brown"
+                android:textSize="14dp"
+                android:textStyle="bold"></TextView>
 
             <TextView
                 android:id="@+id/instruction2"
@@ -233,7 +227,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="154dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -242,12 +236,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="190dp"
+                android:layout_marginLeft="190dp"
                 android:layout_marginTop="50dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Dosage"
+                android:fontFamily="@font/opensans"
+                android:text="Dosis"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -261,7 +255,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -274,7 +268,7 @@
                 android:layout_marginLeft="165dp"
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
+                android:fontFamily="@font/roboto_thin"
                 android:text="TABLET"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
@@ -284,6 +278,4 @@
     </RelativeLayout>
 
 
-
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/p_homepage.xml b/app/src/main/res/layout/p_homepage.xml
index 796244e..c79e1fb 100644
--- a/app/src/main/res/layout/p_homepage.xml
+++ b/app/src/main/res/layout/p_homepage.xml
@@ -1,320 +1,381 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".patient.Homepage"
+    tools:context=".caretaker.Homepage"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background2">
+    android:background="@color/background">
+
+
 
-    <ImageView
-        android:id="@+id/account"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="20dp"
-        android:src="@drawable/i_menu"
-        android:onClick="menu">
-    </ImageView>
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_marginTop="20dp"
+        android:layout_height="250dp"
         android:gravity="center"
-        android:id="@+id/welcome">
+        android:id="@+id/welcome"
+        android:background="@color/backgroud1">
 
-        <TextView
-            android:id="@+id/sa"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:fontFamily="@font/opensans_extrabold"
-            android:textColor="@color/white"
-            android:textSize="24dp"></TextView>
-    </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/uppercard"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:layout_height="180dp">
+            <RelativeLayout
+                android:id="@+id/data"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="visible">
 
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/menu"
+                    android:onClick="menu">
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@drawable/i_menu">
+                    </ImageView>
+                </RelativeLayout>
 
-    <RelativeLayout
-        android:layout_width="320dp"
-        android:layout_height="145dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="120dp"
-        android:background="@drawable/rect_green"
-        android:id="@+id/upcoming">
+                <TextView
+                    android:id="@+id/sa"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="40dp"
+                    android:fontFamily="@font/opensans_extrabold"
+                    android:textColor="@color/white"
+                    android:textSize="24dp" />
 
-        <RelativeLayout
-            android:id="@+id/data"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="invisible">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="55dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="UPCOMING"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="20dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="UPCOMING"
-                android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/hour"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="70dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="64dp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/hour"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginTop="35dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="64dp"
-                android:textStyle="bold" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="75dp"
+                    android:layout_marginLeft="75dp"
+                    android:layout_marginTop="100dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="."
+                    android:textColor="@color/brown"
+                    android:textSize="36dp"
+                    android:textStyle="bold" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="95dp"
-                android:layout_marginLeft="95dp"
-                android:layout_marginTop="65dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="."
-                android:textColor="@color/brown"
-                android:textSize="36dp"
-                android:textStyle="bold" />
+                <TextView
+                    android:id="@+id/ampm"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="85dp"
+                    android:layout_marginLeft="85dp"
+                    android:layout_marginTop="90dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="16dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/minute"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="85dp"
+                    android:layout_marginLeft="85dp"
+                    android:layout_marginTop="100dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="36dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/medicine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="70dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/dosage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="90dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp"
+                    android:textStyle="bold" />
 
+                <TextView
+                    android:id="@+id/instruction"
+                    android:layout_width="125dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="125dp"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="-"
+                    android:textAlignment="textEnd"
+                    android:textColor="@color/brown"
+                    android:textSize="14dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.9"
+                    android:fontFamily="@font/opensans"
+                    android:text="Tidak ada jadwal"
+                    android:textAlignment="center"
+                    android:textColor="@color/brown"
+                    android:textSize="30dp"
+                    android:textStyle="bold"
+                    android:visibility="invisible" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/nodata"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </RelativeLayout>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/schedulemenu"
+        android:layout_marginTop="200dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:background="@drawable/rect_white"
+        android:onClick="gotoSchedule">
+
+        <ImageView
+            android:alpha="0.9"
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_schedule">
+        </ImageView>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
-                android:id="@+id/ampm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="105dp"
-                android:layout_marginLeft="105dp"
-                android:layout_marginTop="55dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
+                android:text="SCHEDULE"
+                android:fontFamily="@font/opensans_extrabold"
                 android:textColor="@color/brown"
                 android:textSize="16dp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/minute"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="105dp"
-                android:layout_marginLeft="105dp"
-                android:layout_marginTop="65dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="36dp"
-                android:textStyle="bold" />
-
+                android:textStyle=""
+                android:id="@+id/sch1">
+            </TextView>
             <TextView
-                android:id="@+id/medicine"
+                android:layout_below="@id/sch1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
-                android:alpha="0.9"
+                android:alpha="0.8"
+                android:text="Jadwal konsumsi obat"
                 android:fontFamily="@font/opensans"
-                android:text="-"
                 android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold" />
+                android:textSize="16dp"
+                android:textStyle="">
+            </TextView>
+        </RelativeLayout>
 
-            <TextView
-                android:id="@+id/dosage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="40dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textColor="@color/brown"
-                android:textSize="14dp"
-                android:textStyle="bold" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/rect_white"
+        android:layout_centerHorizontal="true"
+        android:id="@+id/dosagemenu"
+        android:layout_below="@id/schedulemenu"
+        android:onClick="gotoDosage">
 
+        <ImageView
+            android:layout_width="55dp"
+            android:alpha="0.9"
+            android:layout_height="55dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_dosage">
+        </ImageView>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
-                android:id="@+id/instruction"
-                android:layout_width="125dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="75dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginRight="20dp"
+                android:text="DOSAGE"
                 android:alpha="0.9"
-                android:fontFamily="@font/opensans"
-                android:text="-"
-                android:textAlignment="textEnd"
+                android:fontFamily="@font/opensans_extrabold"
                 android:textColor="@color/brown"
-                android:textSize="14dp" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/nodata"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
+                android:textSize="16dp"
+                android:textStyle=""
+                android:id="@+id/dsg1">
+            </TextView>
             <TextView
-                android:layout_width="match_parent"
+                android:layout_below="@id/dsg1"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:alpha="0.9"
+                android:alpha="0.8"
+                android:text="Dosis konsumsi obat"
                 android:fontFamily="@font/opensans"
-                android:text="No Data"
-                android:textAlignment="center"
                 android:textColor="@color/brown"
-                android:textSize="30dp"
-                android:textStyle="bold" />
-
+                android:textSize="16dp"
+                android:textStyle="">
+            </TextView>
         </RelativeLayout>
-
     </RelativeLayout>
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="170dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:gravity="center"
-        android:layout_below="@id/upcoming"
-        android:id="@+id/row1">
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_below="@id/dosagemenu"
+        android:background="@drawable/rect_white"
+        android:id="@+id/historymenu"
+        android:onClick="gotoHistory">
 
+        <ImageView
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:alpha="0.9"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_history">
+        </ImageView>
         <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:background="@drawable/rect_white"
-            android:onClick="gotoSchedule">
-
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_schedule">
-            </ImageView>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="110dp"
+                android:text="HISTORY"
                 android:alpha="0.9"
-                android:text="SCHEDULE"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans_extrabold"
                 android:textColor="@color/brown"
                 android:textSize="16dp"
-                android:textStyle="">
+                android:textStyle=""
+                android:id="@+id/hst1">
             </TextView>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_marginLeft="20dp"
-            android:background="@drawable/rect_white"
-            android:id="@+id/schedule"
-            android:onClick="gotoDosage">
-
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_dosage">
-            </ImageView>
             <TextView
+                android:layout_below="@id/hst1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="110dp"
-                android:alpha="0.9"
-                android:text="DOSAGE"
-                android:fontFamily="@font/roboto"
+                android:alpha="0.8"
+                android:text="Riwayat konsumsi obat"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown"
                 android:textSize="16dp"
                 android:textStyle="">
             </TextView>
         </RelativeLayout>
-    </LinearLayout>
+    </RelativeLayout>
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="175dp"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
-        android:layout_below="@id/row1"
-        android:id="@+id/row2">
-        <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_below="@id/schedule"
-            android:background="@drawable/rect_white"
-            android:id="@+id/history"
-            android:onClick="gotoHistory">
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_below="@id/historymenu"
+        android:background="@drawable/rect_white"
+        android:id="@+id/infromation"
+        android:onClick="gotoInformation"
+        android:visibility="visible">
 
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_history">
-            </ImageView>
+        <ImageView
+            android:layout_width="55dp"
+            android:layout_height="55dp"
+            android:alpha="0.9"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="30dp"
+            android:src="@drawable/im_patient">
+        </ImageView>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="30dp">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="110dp"
+                android:text="PATIENT"
                 android:alpha="0.9"
-                android:text="HISTORY"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans_extrabold"
                 android:textColor="@color/brown"
                 android:textSize="16dp"
-                android:textStyle="">
+                android:textStyle=""
+                android:id="@+id/pnt1">
             </TextView>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_marginLeft="20dp"
-            android:background="@drawable/rect_white"
-            android:id="@+id/infromation"
-            android:onClick="gotoInformation"
-            android:visibility="visible">
-
-            <ImageView
-                android:layout_width="75dp"
-                android:layout_height="75dp"
-                android:layout_marginTop="20dp"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/im_caretaker">
-            </ImageView>
             <TextView
+                android:layout_below="@id/pnt1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="110dp"
-                android:alpha="0.9"
-                android:text="CARETAKER"
-                android:fontFamily="@font/roboto"
+                android:alpha="0.8"
+                android:text="Pasien yang terhubung"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown"
                 android:textSize="16dp"
                 android:textStyle="">
             </TextView>
         </RelativeLayout>
-    </LinearLayout>
+    </RelativeLayout>
+
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/p_menu.xml b/app/src/main/res/layout/p_menu.xml
index 3f654de..eeb004b 100644
--- a/app/src/main/res/layout/p_menu.xml
+++ b/app/src/main/res/layout/p_menu.xml
@@ -5,68 +5,71 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white1">
 
+
+
     <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="240dp"
-        android:background="@color/green_dark"
-        android:padding="20dp"
         android:id="@+id/header"
-        >
+        android:layout_width="match_parent"
+        android:layout_height="225dp"
+        android:background="@color/backgroud1"
+        android:padding="20dp">
+
         <TextView
-            android:layout_marginTop="40dp"
             android:id="@+id/fullname"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Fullname"
-            android:textSize="48dp"
-            android:fontFamily="@font/roboto"
-            android:textColor="@color/green"
-            android:textStyle="bold">
-        </TextView>
+            android:layout_marginTop="15dp"
+            android:fontFamily="@font/opensans"
+            android:text="Nama Lengkap"
+            android:textColor="@color/white"
+            android:textSize="45dp"
+            android:textStyle="bold" />
+
         <TextView
-            android:layout_marginTop="95dp"
+            android:layout_marginTop="80dp"
             android:id="@+id/username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="username :"
+            android:text="Username :"
             android:textSize="18dp"
-            android:fontFamily="@font/roboto"
-            android:textColor="@color/green"
-            android:textStyle="italic">
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textStyle="">
         </TextView>
+
         <TextView
-            android:layout_marginTop="130dp"
             android:id="@+id/birthday"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Birthday"
-            android:textSize="18dp"
-            android:fontFamily="@font/roboto"
+            android:layout_marginTop="110dp"
+            android:fontFamily="@font/opensans"
+            android:text="Tanggal Lahir"
             android:textColor="@color/white"
-            android:textStyle="italic">
-        </TextView>
+            android:textSize="18dp"
+            android:textStyle="" />
+
         <TextView
-            android:layout_marginTop="150dp"
             android:id="@+id/email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Email"
-            android:textSize="18dp"
-            android:fontFamily="@font/roboto"
+            android:layout_marginTop="135dp"
+            android:fontFamily="@font/opensans"
+            android:text="Email"
             android:textColor="@color/white"
-            android:textStyle="italic">
-        </TextView>
+            android:textSize="18dp"
+            android:textStyle="" />
+
         <TextView
-            android:layout_marginTop="175dp"
             android:id="@+id/phoneNumber"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Your Phone Number"
-            android:textSize="18dp"
-            android:fontFamily="@font/roboto"
+            android:layout_marginTop="160dp"
+            android:fontFamily="@font/opensans"
+            android:text="No. Hp"
             android:textColor="@color/white"
-            android:textStyle="italic">
-        </TextView>
+            android:textSize="18dp"
+            android:textStyle="" />
+
 
     </RelativeLayout>
 
@@ -74,12 +77,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/header"
-        android:layout_alignParentBottom="true">
+        android:layout_alignParentBottom="true"
+        android:padding="10dp">
         <LinearLayout
             android:onClick="logout"
-            android:layout_width="380dp"
-            android:layout_marginTop="10dp"
-            android:layout_centerHorizontal="true"
+            android:layout_width="match_parent"
             android:layout_height="50dp"
             android:padding="10dp"
             android:background="@drawable/rect_stroke_trans_green">
@@ -95,40 +97,30 @@
                 android:text="Logout"
                 android:layout_marginLeft="10dp"
                 android:textSize="18dp"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:textColor="@color/brown">
             </TextView>
         </LinearLayout>
 
     </RelativeLayout>
 
-    <TextView
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="YOUR ACCOUNT"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="13dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
-
-
-    <RelativeLayout
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="15dp"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="12dp"
         android:onClick="backtoHome">
         <ImageView
             android:id="@+id/account"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:src="@drawable/i_back_right"
             android:alpha="0.9">
         </ImageView>
     </RelativeLayout>
 
+
 </RelativeLayout>
+
+
diff --git a/app/src/main/res/layout/p_schedule.xml b/app/src/main/res/layout/p_schedule.xml
index 1c9852f..442e2c2 100644
--- a/app/src/main/res/layout/p_schedule.xml
+++ b/app/src/main/res/layout/p_schedule.xml
@@ -3,35 +3,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/background3"
-    tools:context=".patient.Schedule">
+    android:background="@color/background"
+    tools:context=".caretaker.Schedule">
 
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="backtoHome">
-        <ImageView
-            android:id="@+id/account"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="13dp"
-            android:src="@drawable/i_back"
-            android:alpha="0.9">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/backgroud1">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="12dp"
+            android:onClick="backtoHome">
+            <ImageView
+                android:id="@+id/account"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:src="@drawable/i_back"
+                android:alpha="0.9">
+            </ImageView>
+        </RelativeLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="SCHEDULE"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="12dp"
-        android:alpha="0.9"
-        android:fontFamily="@font/roboto"
-        android:textColor="@color/white"
-        android:textSize="18dp">
-    </TextView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="SCHEDULE"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:alpha="0.9"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/white"
+            android:textSize="20dp">
+        </TextView>
+    </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -39,6 +44,7 @@
         android:layout_marginTop="50dp"
         android:gravity="center"
         android:layout_centerHorizontal="true">
+
         <RelativeLayout
             android:layout_width="325dp"
             android:layout_height="250dp"
@@ -62,8 +68,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="40dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -76,7 +82,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="65dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -89,8 +95,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="110dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Period"
+                android:fontFamily="@font/opensans"
+                android:text="Target"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -103,7 +109,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="130dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -117,7 +123,7 @@
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto_thin_italic"
-                android:text="*This term can change according to the patient's condition"
+                android:text="*Dapat berubah-ubah disesuaikan dengan kondisi pasien"
                 android:textColor="@color/brown"
                 android:textSize="11dp"
                 android:textStyle="">
@@ -126,12 +132,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="155dp"
+                android:layout_marginLeft="155dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Interval"
+                android:fontFamily="@font/opensans"
+                android:text="Rentang Jadwal"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -145,7 +151,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="70dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -154,18 +160,17 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="155dp"
-                android:layout_marginLeft="165dp"
+                android:layout_marginStart="170dp"
+                android:layout_marginLeft="170dp"
                 android:layout_marginTop="160dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
-                android:text="MINUTES"
+                android:alpha="0.8"
+                android:fontFamily="@font/roboto_thin"
+                android:text="MENIT"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
-                android:textStyle="bold">
+                android:textStyle="">
             </TextView>
 
-
         </RelativeLayout>
 
         <RelativeLayout
@@ -185,6 +190,7 @@
                 android:src="@drawable/background_rect">
             </ImageView>
 
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -192,8 +198,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="40dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="The Medicine"
+                android:fontFamily="@font/opensans"
+                android:text="Nama Obat"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -206,7 +212,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="65dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textColor="@color/brown"
                 android:textSize="14dp"
@@ -219,8 +225,8 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginTop="110dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Period"
+                android:fontFamily="@font/opensans"
+                android:text="Target"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -247,7 +253,7 @@
                 android:layout_marginTop="160dp"
                 android:alpha="0.9"
                 android:fontFamily="@font/roboto_thin_italic"
-                android:text="*This term can change according to the patient's condition"
+                android:text="*Dapat berubah-ubah disesuaikan dengan kondisi pasien"
                 android:textColor="@color/brown"
                 android:textSize="11dp"
                 android:textStyle="">
@@ -256,12 +262,12 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="180dp"
-                android:layout_marginLeft="180dp"
+                android:layout_marginStart="155dp"
+                android:layout_marginLeft="155dp"
                 android:layout_marginTop="60dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
-                android:text="Interval"
+                android:fontFamily="@font/opensans"
+                android:text="Rentang Jadwal"
                 android:textColor="@color/green_dark"
                 android:textSize="14dp">
             </TextView>
@@ -275,7 +281,7 @@
                 android:layout_marginLeft="160dp"
                 android:layout_marginTop="70dp"
                 android:alpha="0.9"
-                android:fontFamily="@font/roboto"
+                android:fontFamily="@font/opensans"
                 android:text="-"
                 android:textAlignment="center"
                 android:textColor="@color/brown"
@@ -284,19 +290,17 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="155dp"
-                android:layout_marginLeft="165dp"
+                android:layout_marginStart="170dp"
+                android:layout_marginLeft="170dp"
                 android:layout_marginTop="160dp"
-                android:alpha="0.9"
-                android:fontFamily="@font/roboto_thin_italic"
-                android:text="MINUTES"
+                android:alpha="0.8"
+                android:fontFamily="@font/roboto_thin"
+                android:text="MENIT"
                 android:textColor="@color/brown"
                 android:textSize="24dp"
                 android:textStyle="bold">
             </TextView>
         </RelativeLayout>
-    </RelativeLayout>
-
-
 
+    </RelativeLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/p_username.xml b/app/src/main/res/layout/p_username.xml
index c02210f..bdfd85f 100644
--- a/app/src/main/res/layout/p_username.xml
+++ b/app/src/main/res/layout/p_username.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/background4"
+    android:background="@color/background"
     tools:context=".patient.CreateUsername">
 
     <RelativeLayout
@@ -20,7 +20,7 @@
             android:layout_marginTop="25dp"
             android:alpha="0.9"
             android:fontFamily="@font/opensans"
-            android:text="Set your username"
+            android:text="Atur Username"
             android:textColor="@color/brown"
             android:textSize="20dp"
             android:textStyle="bold">
@@ -57,7 +57,7 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/rect_stroke_bottom"
                     android:fontFamily="@font/opensans"
-                    android:hint="Enter your username"
+                    android:hint="Masukkan username"
                     android:paddingLeft="5dp"
                     android:textColor="@color/brown"
                     android:textColorHint="@color/green_dark"
@@ -73,7 +73,7 @@
             android:alpha="0.9"
             android:fontFamily="@font/opensans_italic"
             android:gravity="center_horizontal"
-            android:text="This username will be used when the caretaker connects his account with your account"
+            android:text="*Username ini akan digunakan oleh Carteker untuk menghubungkan akun kepada akun anda"
             android:textAlignment="center"
             android:textColor="@color/brown"
             android:textSize="16dp"></TextView>
@@ -95,7 +95,7 @@
                 android:alpha="0.8"
                 android:fontFamily="@font/opensans"
                 android:text="Set"
-                android:textColor="@color/brown"
+                android:textColor="@color/white"
                 android:textSize="20dp" />
         </RelativeLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 259184d..969e296 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,5 +18,7 @@
     <color name="cream">#F2EDD7</color>
     <color name="skeleton">#C9D3D3</color>
     <color name="shimmer">#C0C0C0</color>
+    <color name="background">#F8F8F8</color>
+    <color name="backgroud1">#8EC298</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7aa09ae..d80cf18 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,10 +1,10 @@
 <resources>
     <string name="app_name">SMOX</string>
     <string-array name="period_list">
-        <item>Days</item>
-        <item>Weeks</item>
-        <item>Months</item>
-        <item>Years</item>
+        <item>Hari</item>S
+        <item>Minggu</item>
+        <item>Bulan</item>
+        <item>Tahun</item>
     </string-array>
     <string name="period">Period</string>
     <string name="open">Open</string>