diff --git a/app/src/main/java/com/medmapper/v33001/MainViewModel.kt b/app/src/main/java/com/medmapper/v33001/MainViewModel.kt
index ce63c9b..f24e3d7 100644
--- a/app/src/main/java/com/medmapper/v33001/MainViewModel.kt
+++ b/app/src/main/java/com/medmapper/v33001/MainViewModel.kt
@@ -18,7 +18,7 @@ class MainViewModel(var medicineService : IMedicineService) /*= MedicineService(
 
     internal val NEW_MEDICATION = "New Medication"
     var medicine : MutableLiveData<List<Medicine>> = MutableLiveData<List<Medicine>>()
-    var selectedMedicine by mutableStateOf(Medicine())
+    private var selectedMedicine by mutableStateOf(Medicine())
     var user: User? = null
 
     private lateinit var firestore: FirebaseFirestore
@@ -67,14 +67,14 @@ class MainViewModel(var medicineService : IMedicineService) /*= MedicineService(
         user?.let {
             user ->
             val document =
-                if (selectedMedicine.medicationID == null || selectedMedicine.medicationID.isEmpty()) {
+                if (selectedMedicine.id == null || selectedMedicine.id.isEmpty()) {
                     // create a new medicine
                     firestore.collection("users").document(user.uid).collection("medications").document()
                 } else {
                     // update an existing specimen
                     firestore.collection("users").document(user.uid).collection("medications").document()
                 }
-            selectedMedicine.medicationID = document.id
+            selectedMedicine.id = document.id
             val handle = document.set(selectedMedicine)
             handle.addOnSuccessListener { Log.d("Firebase", "Document Saved") }
             handle.addOnFailureListener { Log.d("Firebase", "Save failed $it") }
diff --git a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt
index 99d6144..ec2655e 100644
--- a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt
+++ b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt
@@ -3,16 +3,16 @@ package com.medmapper.v33001.dto
 import java.time.LocalDate
 
 data class Medicine(
-    val id: String = "",
-    val uid: String = "",
-    val name: String = "",
-    val quantity: Int = 0,
-    val prescriptionStrength: String = "",
-    val startDate: LocalDate = LocalDate.now(),
-    val prescriptionLength: String = "",
-    val time: Long = 0,
+    var id: String = "",
+    var uid: String = "",
+    var name: String = "",
+    var quantity: Int = 0,
+    var prescriptionStrength: String = "",
+    var startDate: LocalDate = LocalDate.now(),
+    var prescriptionLength: String = "",
+    var time: Long = 0,
     // Frequency per 24 hours
-    val frequency: Int = 0) {
+    var frequency: Int = 0) {
     override fun toString(): String {
         return "$name, $quantity , $prescriptionStrength"
     }
diff --git a/app/src/main/res/layout/layout3.xml b/app/src/main/res/layout/layout3.xml
index b876cdc..4bc77e1 100644
--- a/app/src/main/res/layout/layout3.xml
+++ b/app/src/main/res/layout/layout3.xml
@@ -76,7 +76,7 @@
                 android:id="@+id/button10"
                 android:layout_width="234dp"
                 android:layout_height="78dp"
-                android:text="Add new Medicine "
+                android:text="Add new Medication "
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.497"
                 app:layout_constraintStart_toStartOf="parent"
@@ -93,7 +93,7 @@
                 android:text="Name"
                 app:layout_constraintStart_toStartOf="parent"
                 tools:layout_editor_absoluteY="100dp"
-                tools:text="Medicine Name" />
+                tools:text="Medication Name" />
 
             <EditText
                 android:id="@+id/editTextTextEmailAddress2"
@@ -155,3 +155,4 @@
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file