diff --git a/app/src/main/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt b/app/src/main/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt
index 76011bc..8f82296 100644
--- a/app/src/main/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt
+++ b/app/src/main/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt
@@ -75,6 +75,10 @@ class ViewSiteActivity : AppCompatActivity() {
       addObserver(statusUpdateReceiver)
     }
 
+    // Populate view model with initial data
+    val model = intent.getSerializableExtra(KEY_SITE) as Site
+    viewModel.setModel(model)
+
     // Loading
     loadingProgress.observe(this, viewModel.onIsLoading())
 
@@ -149,10 +153,6 @@ class ViewSiteActivity : AppCompatActivity() {
     doneBtn.setOnClickListener {
       viewModel.commit { finish() }
     }
-
-    // Populate view model with initial data
-    val model = intent.getSerializableExtra(KEY_SITE) as Site
-    viewModel.setModel(model)
   }
 
   private fun setupUi() {
diff --git a/app/src/test/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelTest.kt b/app/src/test/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelTest.kt
index 5f66a73..04e1c79 100644
--- a/app/src/test/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelTest.kt
+++ b/app/src/test/kotlin/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelTest.kt
@@ -228,7 +228,7 @@ class ViewSiteViewModelTest {
     text.assertValues(TEXT_CHECKS_DISABLED)
 
     viewModel.disabled.value = false
-    text.assertValues("December 6, 8:35AM")
+    text.assertValues("December 6, 8:35 AM")
   }
 
   @Test fun getCheckIntervalMs() {
diff --git a/common/src/main/kotlin/com/afollestad/nocknock/utilities/ext/DateExt.kt b/common/src/main/kotlin/com/afollestad/nocknock/utilities/ext/DateExt.kt
index 64c1008..6ef6e7f 100644
--- a/common/src/main/kotlin/com/afollestad/nocknock/utilities/ext/DateExt.kt
+++ b/common/src/main/kotlin/com/afollestad/nocknock/utilities/ext/DateExt.kt
@@ -23,6 +23,6 @@ fun Long.formatDate(): String {
   if (this <= 0) {
     return "(None)"
   }
-  val df = SimpleDateFormat("MMMM d, h:mma", Locale.getDefault())
+  val df = SimpleDateFormat("MMMM d, h:mm a", Locale.getDefault())
   return df.format(Date(this))
 }
diff --git a/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt b/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt
index e27be55..4ca3564 100644
--- a/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt
+++ b/viewcomponents/src/main/kotlin/com/afollestad/nocknock/viewcomponents/livedata/LiveDataViewExt.kt
@@ -38,7 +38,17 @@ inline fun <reified T> EditText.attachLiveData(
 ) {
   // Initial value
   if (T::class == String::class) {
-    data.value = this.text.trim().toString() as T
+    if (data.value != null) {
+      this.setText(data.value as? String)
+    } else {
+      data.value = this.text.trim().toString() as T
+    }
+  } else if (T::class == Int::class) {
+    if (data.value != null) {
+      this.setText(data.value.toString())
+    } else {
+      data.value = this.text.trim().toString().toInt() as T
+    }
   }
   // Out
   if (pushOutChanges) {