diff --git a/lib/addevent.dart b/lib/addevent.dart
index 6a2fc8882df97691a85c5e58193cd5eafeab2548..c3a55b529529a3454912f4f58b4eace8bef06cea 100644
--- a/lib/addevent.dart
+++ b/lib/addevent.dart
@@ -41,9 +41,9 @@ class _AddEventPageState extends State<AddEvent>  {
 
       if (syncGNSSData == true) {
         if(mounted){
-        setState(() {
-          //refresh UI on update
-        });}
+          setState(() {
+            //refresh UI on update
+          });}
       };
     });
   }
@@ -72,9 +72,9 @@ class _AddEventPageState extends State<AddEvent>  {
       if(hasPermission){
         debugPrint('Location permissions granted');
         if(mounted){
-        setState(() {
-          //refresh the UI
-        });};
+          setState(() {
+            //refresh the UI
+          });};
 
         getLocation();
       }
@@ -82,9 +82,9 @@ class _AddEventPageState extends State<AddEvent>  {
       debugPrint("GPS Service is not enabled, turn on GPS location");
     }
     if(mounted){
-    setState(() {
-      //refresh the UI
-    });}
+      setState(() {
+        //refresh the UI
+      });}
   }
 
   @override
@@ -99,15 +99,15 @@ class _AddEventPageState extends State<AddEvent>  {
     currentEvent.store.status = "PENDING";
     storedEvents.store.add(
         Event(
-          currentEvent.store.id,
-          currentEvent.store.urn,
-          currentEvent.store.label,
-          currentEvent.store.type,
-          currentEvent.store.description,
-          currentEvent.store.status,
-          currentEvent.store.latitude,
-          currentEvent.store.longitude,
-          currentEvent.store.elevation
+            currentEvent.store.id,
+            currentEvent.store.urn,
+            currentEvent.store.label,
+            currentEvent.store.type,
+            currentEvent.store.description,
+            currentEvent.store.status,
+            currentEvent.store.latitude,
+            currentEvent.store.longitude,
+            currentEvent.store.elevation
         ));
   }
 
@@ -130,7 +130,7 @@ class _AddEventPageState extends State<AddEvent>  {
 
       if(accuracy == 0.0){
         gnssStatusText = "No-Fix";
-        }
+      }
       else{
         gnssStatusText = "Precision: "+ accuracy.toStringAsFixed(2) +"m";
       }
@@ -196,33 +196,42 @@ class _AddEventPageState extends State<AddEvent>  {
                 currentEvent.store.description = value;
               },
             ),
-            TextField(
-              readOnly: false,
-              enabled: !syncGNSSData,
-              //controller: _controllerLat,
-              controller: TextEditingController(text: currentEvent.store.latitude.toString()),
-              decoration: const InputDecoration(
-                labelText: 'Latitude',
-                border: OutlineInputBorder(),
-              ),
+            TextFormField(
+                readOnly: false,
+                enabled: !syncGNSSData,
+                controller: TextEditingController(text: currentEvent.store.latitude.toString()),
+                decoration: const InputDecoration(
+                  labelText: 'Latitude',
+                  border: OutlineInputBorder(),
+                ),
+                onChanged: (value) {
+                  currentEvent.store.latitude = value;
+                }
             ),
-            TextField(
-              readOnly: false,
-              enabled: !syncGNSSData,
-              controller: TextEditingController(text: currentEvent.store.longitude.toString()),
-              decoration: const InputDecoration(
-                labelText: 'Longitude',
-                border: OutlineInputBorder(),
-              ),
+            TextFormField(
+                readOnly: false,
+                enabled: !syncGNSSData,
+                controller: TextEditingController(text: currentEvent.store.longitude.toString()),
+                decoration: const InputDecoration(
+                  labelText: 'Longitude',
+                  border: OutlineInputBorder(),
+
+                ),
+                onChanged: (value) {
+                  currentEvent.store.longitude = value;
+                }
             ),
-            TextField(
-              readOnly: false,
-              enabled: !syncGNSSData,
-              controller: TextEditingController(text: currentEvent.store.elevation.toString()),
-              decoration: const InputDecoration(
-                labelText: 'Elevation',
-                border: OutlineInputBorder(),
-              ),
+            TextFormField(
+                readOnly: false,
+                enabled: !syncGNSSData,
+                controller: TextEditingController(text: currentEvent.store.elevation.toString()),
+                decoration: const InputDecoration(
+                  labelText: 'Elevation',
+                  border: OutlineInputBorder(),
+                ),
+                onChanged: (value) {
+                  currentEvent.store.elevation = value;
+                }
             ),
           ]),
       bottomNavigationBar: Row(