diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0e052bce..1db86491b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,3 +21,4 @@ Lib: Fix issue with failed tile downloads
 Lib: Use two decimal precision for average speed
 Android: Fix sensor scanning state handling for internal and Ble sensors.
 Android: Fix handling of unpaired power meters
+GTK: Add support for Nominatim reverse
diff --git a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/config/Strings.kt b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/config/Strings.kt
index f55e404bb..33a61ff3e 100644
--- a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/config/Strings.kt
+++ b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/config/Strings.kt
@@ -33,6 +33,7 @@ object Strings {
     const val ACTION_LOCATION_COPY  = "locationCopy"
     const val ACTION_LOCATION_PASTE = "locationPaste"
     const val ACTION_LOCATION_REVERSE = "locationReverse"
+    const val ACTION_LOCATION_REVERSE_CENTER = "locationReverseCenter"
     const val ACTION_LOCATION_CM    = "locationCM"
 
     // Custom widgets
diff --git a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/menu/provider/LocationMenu.kt b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/menu/provider/LocationMenu.kt
index 0e6d4cecc..3c3cd22c7 100644
--- a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/menu/provider/LocationMenu.kt
+++ b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/menu/provider/LocationMenu.kt
@@ -1,29 +1,61 @@
 package ch.bailu.aat_gtk.view.menu.provider
 
+import ch.bailu.aat_gtk.app.GtkAppContext
 import ch.bailu.aat_gtk.config.Strings
 import ch.bailu.aat_gtk.controller.ClipboardController
 import ch.bailu.aat_gtk.controller.UiControllerInterface
 import ch.bailu.aat_gtk.view.map.GtkCustomMapView
 import ch.bailu.aat_gtk.view.menu.MenuHelper
+import ch.bailu.aat_lib.api.cm.CmApi
+import ch.bailu.aat_lib.api.nominatim.NominatimReverseApi
+import ch.bailu.aat_lib.app.AppContext
+import ch.bailu.aat_lib.dispatcher.DispatcherInterface
+import ch.bailu.aat_lib.gpx.GpxPointNode
+import ch.bailu.aat_lib.gpx.attributes.GpxAttributes
+import ch.bailu.aat_lib.gpx.attributes.Keys
+import ch.bailu.aat_lib.gpx.information.GpxInformation
+import ch.bailu.aat_lib.gpx.information.InfoID
 import ch.bailu.aat_lib.logger.AppLog
 import ch.bailu.aat_lib.preferences.StorageInterface
 import ch.bailu.aat_lib.preferences.map.SolidMapGrid
+import ch.bailu.aat_lib.preferences.map.overlay.SolidNominatimReverseOverlay
+import ch.bailu.aat_lib.preferences.system.SolidDataDirectory
 import ch.bailu.aat_lib.resources.Res
 import ch.bailu.aat_lib.resources.ToDo
 import ch.bailu.gtk.gdk.Display
 import ch.bailu.gtk.gio.Menu
 import ch.bailu.gtk.gtk.Application
 import ch.bailu.gtk.type.Str
+import org.mapsforge.map.view.MapView
+import kotlin.text.ifEmpty
 
 class LocationMenu : MenuProviderInterface {
     override fun createMenu(): Menu {
         return Menu().apply {
             append(Res.str().clipboard_copy(), MenuHelper.toAppAction(Strings.ACTION_LOCATION_COPY))
-            append(Res.str().clipboard_paste(), MenuHelper.toAppAction(Strings.ACTION_LOCATION_PASTE))
-            appendSection(Str.NULL, Menu().apply {
-                append(ToDo.translate("About location"), MenuHelper.toAppAction(Strings.ACTION_LOCATION_REVERSE))
-                append(ToDo.translate("CM locations"), MenuHelper.toAppAction(Strings.ACTION_LOCATION_CM))
+            append(
+                Res.str().clipboard_paste(),
+                MenuHelper.toAppAction(Strings.ACTION_LOCATION_PASTE)
+            )
+            appendSection(ToDo.translate("Reverse Nominatim"), Menu().apply {
+                append(
+                    ToDo.translate("Query"),
+                    MenuHelper.toAppAction(Strings.ACTION_LOCATION_REVERSE)
+                )
+                append(
+                    ToDo.translate("Center"),
+                    MenuHelper.toAppAction(Strings.ACTION_LOCATION_REVERSE_CENTER)
+                )
             })
+
+            if (CmApi.ENABLED) {
+                appendSection(Str.NULL, Menu().apply {
+                    append(
+                        ToDo.translate("CM locations"),
+                        MenuHelper.toAppAction(Strings.ACTION_LOCATION_CM)
+                    )
+                })
+            }
         }
     }
 
@@ -38,9 +70,31 @@ class LocationMenu : MenuProviderInterface {
     override fun updateActionValues(app: Application) {}
 
     companion object {
-        fun createActions(storageInterface: StorageInterface, app: Application, display: Display, uiController: UiControllerInterface) {
-            val clipboard = ClipboardController(display)
+        /**
+         * Independent closure for handling menu actions
+         */
+        fun createActions(
+            app: Application,
+            appContext: AppContext,
+            display: Display,
+            mapView: MapView,
+            dispatcher: DispatcherInterface,
+            uiController: UiControllerInterface
+        ) {
+
+            createActionsClipboard(app, appContext.storage, display, uiController)
+            createActionsNominatimReverse(app, appContext, mapView, uiController, dispatcher)
+            createActionsCm(app, appContext.dataDirectory)
+
+        }
 
+        private fun createActionsClipboard(
+            app: Application,
+            storage: StorageInterface,
+            display: Display,
+            uiController: UiControllerInterface
+        ) {
+            val clipboard = ClipboardController(display)
             MenuHelper.setAction(app, Strings.ACTION_LOCATION_PASTE) {
                 clipboard.getLatLong {
                     AppLog.i(this, it.toString())
@@ -49,19 +103,69 @@ class LocationMenu : MenuProviderInterface {
             }
 
             MenuHelper.setAction(app, Strings.ACTION_LOCATION_COPY) {
-                val sgrid = SolidMapGrid(storageInterface, GtkCustomMapView.DEFAULT_KEY)
-                val text = sgrid.getCode(uiController.getMapBounding().center.toLatLong()).toString()
+                val sgrid = SolidMapGrid(storage, GtkCustomMapView.DEFAULT_KEY)
+                val text =
+                    sgrid.getCode(uiController.getMapBounding().center.toLatLong()).toString()
 
                 AppLog.i(this, text)
-                clipboard.setText(sgrid.getCode(uiController.getMapBounding().center.toLatLong()).toString())
+                clipboard.setText(
+                    sgrid.getCode(uiController.getMapBounding().center.toLatLong()).toString()
+                )
+            }
+        }
+
+        private fun createActionsCm(app: Application, dataDirectory: SolidDataDirectory) {
+            val cmApi = CmApi(dataDirectory)
+            MenuHelper.setAction(app, Strings.ACTION_LOCATION_CM) {
+                cmApi.startTask(GtkAppContext)
             }
 
+        }
+
+        private fun createActionsNominatimReverse(
+            app: Application,
+            appContext: AppContext,
+            mapView: MapView,
+            uiController: UiControllerInterface,
+            dispatcher: DispatcherInterface
+        ) {
+            val soverlay = SolidNominatimReverseOverlay(appContext.dataDirectory)
+            val reverseApi = NominatimReverseApi(soverlay)
+            var isUpdated = false
+
             MenuHelper.setAction(app, Strings.ACTION_LOCATION_REVERSE) {
-                AppLog.d(this,uiController.getMapBounding().center.toLatLong().toString() + " -> query/nominatim-reverse.json")
+                if (!reverseApi.isTaskRunning(GtkAppContext.services)) {
+                    reverseApi.startTask(
+                        GtkAppContext,
+                        uiController.getMapBounding().center,
+                        mapView.model.mapViewPosition.zoomLevel.toInt()
+                    )
+                    soverlay.setEnabled(true)
+                    isUpdated = true
+                }
             }
 
-            MenuHelper.setAction(app, Strings.ACTION_LOCATION_CM) {
-                AppLog.d(this, "https://api-gw.criticalmaps.net/locations -> query/cm.json")
+            MenuHelper.setAction(app, Strings.ACTION_LOCATION_REVERSE_CENTER) {
+                uiController.centerInMap(soverlay.getIID())
+            }
+
+
+            dispatcher.addTarget({ iid: Int, info: GpxInformation ->
+                if (isUpdated) {
+                    val firstNode = info.getGpxList().pointList.first
+                    if (firstNode is GpxPointNode) {
+                        AppLog.i(this, getMessage(firstNode.getAttributes()))
+                    }
+                    isUpdated = false
+                }
+            }, InfoID.NOMINATIM_REVERSE)
+        }
+
+        private fun getMessage(attributes: GpxAttributes): String {
+            return attributes[Keys.toIndex("name")].ifEmpty {
+                attributes[Keys.toIndex("city")].ifEmpty {
+                    attributes[Keys.toIndex("label")]
+                }
             }
         }
     }
diff --git a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MainWindow.kt b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MainWindow.kt
index e4c3f3ae8..1b912605b 100644
--- a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MainWindow.kt
+++ b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MainWindow.kt
@@ -12,7 +12,6 @@ import ch.bailu.aat_gtk.util.GtkTimer
 import ch.bailu.aat_gtk.view.dialog.FileChangedDialog
 import ch.bailu.aat_gtk.view.dialog.PreferencesDialog
 import ch.bailu.aat_gtk.view.map.GtkCustomMapView
-import ch.bailu.aat_gtk.view.menu.provider.LocationMenu
 import ch.bailu.aat_gtk.view.messages.MessageOverlay
 import ch.bailu.aat_gtk.view.search.PoiPage
 import ch.bailu.aat_gtk.view.toplevel.navigation.NavigationView
@@ -33,8 +32,8 @@ import ch.bailu.aat_lib.dispatcher.usage.UsageTrackers
 import ch.bailu.aat_lib.gpx.information.GpxInformation
 import ch.bailu.aat_lib.gpx.information.InfoID
 import ch.bailu.aat_lib.gpx.information.InformationUtil
-import ch.bailu.aat_lib.preferences.map.overlay.SolidOverlayFileEnabled
 import ch.bailu.aat_lib.preferences.map.SolidPositionLock
+import ch.bailu.aat_lib.preferences.map.overlay.SolidOverlayFileEnabled
 import ch.bailu.aat_lib.resources.Res
 import ch.bailu.foc.Foc
 import ch.bailu.gtk.adw.Application
@@ -116,8 +115,6 @@ class MainWindow(private val app: Application, private val appContext: AppContex
         window.onDestroy {
             exit(dispatcher, 0)
         }
-
-        LocationMenu.createActions(appContext.storage, app, window.display, this)
     }
 
     private fun clearEditor(onCleared: ()->Unit)  {
@@ -255,6 +252,8 @@ class MainWindow(private val app: Application, private val appContext: AppContex
         dispatcher.addOverlaySources(appContext, usageTrackers)
         dispatcher.addSource(FixedOverlaySource.createDraftSource(appContext, usageTrackers))
         dispatcher.addSource(FixedOverlaySource.createPoiSource(appContext, usageTrackers))
+        dispatcher.addSource(FixedOverlaySource.createCmSource(appContext, usageTrackers))
+        dispatcher.addSource(FixedOverlaySource.createNominatimReverseSource(appContext, usageTrackers))
         dispatcher.addSource(editorSource)
         dispatcher.addTarget(metaInfoCollector, InfoID.ALL)
     }
diff --git a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MapMainView.kt b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MapMainView.kt
index 7afd143d7..0590eeab0 100644
--- a/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MapMainView.kt
+++ b/aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/toplevel/MapMainView.kt
@@ -12,6 +12,7 @@ import ch.bailu.aat_gtk.view.map.control.InfoBar
 import ch.bailu.aat_gtk.view.map.control.MainBar
 import ch.bailu.aat_gtk.view.map.control.NavigationBar
 import ch.bailu.aat_gtk.view.map.control.NodeInfo
+import ch.bailu.aat_gtk.view.menu.provider.LocationMenu
 import ch.bailu.aat_gtk.view.toplevel.navigation.NavigationView
 import ch.bailu.aat_lib.app.AppContext
 import ch.bailu.aat_lib.dispatcher.DispatcherInterface
@@ -147,6 +148,8 @@ class MapMainView(
         overlay.addOverlay(statusLabel.box)
 
         showMainBar()
+
+        LocationMenu.createActions(app, appContext, window.display, map, dispatcher, uiController)
     }
 
     private fun addBar(bar: Bar) {
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/api/Api.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/api/Api.kt
index 5d244a2d7..ee2c33012 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/api/Api.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/api/Api.kt
@@ -5,6 +5,10 @@ import ch.bailu.aat_lib.service.ServicesInterface
 import ch.bailu.aat_lib.service.background.FileTask
 import ch.bailu.foc.Foc
 
+/**
+ * Abstract base class for all APIs
+ * startTask uses individual implementations
+ */
 abstract class Api(private val overlay: SolidOverlayInterface) {
     val apiName: String
         get() = overlay.getLabel()
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/api/cm/CmApi.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/api/cm/CmApi.kt
index b1fbc8609..2325d5de7 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/api/cm/CmApi.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/api/cm/CmApi.kt
@@ -16,4 +16,7 @@ class CmApi(baseDirectory: SolidDataDirectory) : Api(SolidCriticalMapOverlay(bas
             background.process(task)
         }
     }
+    companion object {
+        const val ENABLED = false // TODO handle as experimental feature and enable via env variable
+    }
 }
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/dispatcher/source/FixedOverlaySource.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/dispatcher/source/FixedOverlaySource.kt
index 650c3894d..647d895a9 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/dispatcher/source/FixedOverlaySource.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/dispatcher/source/FixedOverlaySource.kt
@@ -2,12 +2,15 @@ package ch.bailu.aat_lib.dispatcher.source
 
 import ch.bailu.aat_lib.app.AppContext
 import ch.bailu.aat_lib.dispatcher.usage.UsageTrackerInterface
-import ch.bailu.aat_lib.gpx.information.InfoID
 import ch.bailu.aat_lib.preferences.StorageInterface
-import ch.bailu.aat_lib.util.fs.AppDirectory
+import ch.bailu.aat_lib.preferences.map.overlay.SolidCriticalMapOverlay
+import ch.bailu.aat_lib.preferences.map.overlay.SolidDraftOverlay
+import ch.bailu.aat_lib.preferences.map.overlay.SolidFixedOverlay
+import ch.bailu.aat_lib.preferences.map.overlay.SolidNominatimReverseOverlay
+import ch.bailu.aat_lib.preferences.map.overlay.SolidPoiOverlay
 
-class FixedOverlaySource(context: AppContext, usageTracker: UsageTrackerInterface, private val directory: String, private val file: String, iid: Int):
-    FileSource(context, iid, usageTracker) {
+class FixedOverlaySource(context: AppContext, usageTracker: UsageTrackerInterface, private val overlay: SolidFixedOverlay):
+    FileSource(context, overlay.getIID(), usageTracker) {
 
     private val dataDirectory = context.dataDirectory
 
@@ -18,7 +21,7 @@ class FixedOverlaySource(context: AppContext, usageTracker: UsageTrackerInterfac
     }
 
     private fun onPreferencesChanged() {
-        setFile(dataDirectory.getValueAsFile().descendant(directory).child(file))
+        setFile(overlay.getValueAsFile())
     }
 
     override fun onResumeWithService() {
@@ -34,11 +37,23 @@ class FixedOverlaySource(context: AppContext, usageTracker: UsageTrackerInterfac
 
     companion object {
         fun createPoiSource(context: AppContext, usageTracker: UsageTrackerInterface): FileSource {
-            return FixedOverlaySource(context, usageTracker, AppDirectory.DIR_POI, AppDirectory.FILE_POI, InfoID.POI)
+            val overlay = SolidPoiOverlay(context.dataDirectory)
+            return FixedOverlaySource(context, usageTracker, overlay)
         }
 
         fun createDraftSource(context: AppContext, usageTracker: UsageTrackerInterface): FileSource {
-            return FixedOverlaySource(context, usageTracker, AppDirectory.DIR_EDIT, AppDirectory.FILE_DRAFT, InfoID.EDITOR_DRAFT)
+            val overlay = SolidDraftOverlay(context.dataDirectory)
+            return FixedOverlaySource(context, usageTracker, overlay)
+        }
+
+        fun createNominatimReverseSource(context: AppContext, usageTracker: UsageTrackerInterface): FileSource {
+            val overlay = SolidNominatimReverseOverlay(context.dataDirectory)
+            return FixedOverlaySource(context, usageTracker, overlay)
+        }
+
+        fun createCmSource(context: AppContext, usageTracker: UsageTrackerInterface): FileSource {
+            val overlay = SolidCriticalMapOverlay(context.dataDirectory)
+            return FixedOverlaySource(context, usageTracker, overlay)
         }
     }
 }
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/gpx/information/InformationUtil.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/gpx/information/InformationUtil.kt
index 084e56810..c04234c95 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/gpx/information/InformationUtil.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/gpx/information/InformationUtil.kt
@@ -1,5 +1,6 @@
 package ch.bailu.aat_lib.gpx.information
 
+import ch.bailu.aat_lib.api.cm.CmApi
 import ch.bailu.aat_lib.preferences.map.overlay.SolidCustomOverlayList
 import ch.bailu.aat_lib.resources.Res
 import ch.bailu.aat_lib.resources.ToDo
@@ -7,7 +8,6 @@ import ch.bailu.aat_lib.resources.ToDo
 object InformationUtil {
 
     fun defaultName(iid: Int): String {
-        // TODO: use enum for this
         when(iid) {
             InfoID.POI -> return Res.str().p_mapsforge_poi()
             InfoID.EDITOR_DRAFT -> return ToDo.translate("Draft")
@@ -45,6 +45,10 @@ object InformationUtil {
             add(InfoID.EDITOR_OVERLAY)
             add(InfoID.TRACKER)
             add(InfoID.LIST_SUMMARY)
+            add(InfoID.NOMINATIM_REVERSE)
+            if (CmApi.ENABLED) {
+                add(InfoID.CRITICAL_MAP)
+            }
         }
     }
 
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidBrouterOverlay.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidBrouterOverlay.kt
index 852844213..1687ffedb 100644
--- a/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidBrouterOverlay.kt
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidBrouterOverlay.kt
@@ -8,4 +8,4 @@ class SolidBrouterOverlay(baseDirectory: SolidDataDirectory) :
     SolidFixedOverlay(baseDirectory,
         InfoID.BROUTER,
         AppDirectory.DIR_QUERY,
-        AppDirectory.FILE_BROUTER)
\ No newline at end of file
+        AppDirectory.FILE_BROUTER)
diff --git a/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidDraftOverlay.kt b/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidDraftOverlay.kt
new file mode 100644
index 000000000..4d1ac2a22
--- /dev/null
+++ b/aat-lib/src/main/java/ch/bailu/aat_lib/preferences/map/overlay/SolidDraftOverlay.kt
@@ -0,0 +1,11 @@
+package ch.bailu.aat_lib.preferences.map.overlay
+
+import ch.bailu.aat_lib.gpx.information.InfoID
+import ch.bailu.aat_lib.preferences.system.SolidDataDirectory
+import ch.bailu.aat_lib.util.fs.AppDirectory
+
+class SolidDraftOverlay(baseDirectory: SolidDataDirectory) :
+    SolidFixedOverlay(baseDirectory,
+        InfoID.EDITOR_DRAFT,
+        AppDirectory.DIR_EDIT,
+        AppDirectory.FILE_DRAFT)
diff --git a/doc/uml/dispatcher.uxf b/doc/uml/dispatcher.uxf
index cac29565a..800d46278 100644
--- a/doc/uml/dispatcher.uxf
+++ b/doc/uml/dispatcher.uxf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <diagram program="umlet" version="15.0.0">
-  <zoom_level>10</zoom_level>
+  <zoom_level>8</zoom_level>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>480</x>
-      <y>280</y>
-      <w>380</w>
-      <h>100</h>
+      <x>440</x>
+      <y>312</y>
+      <w>304</w>
+      <h>80</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 SourceInterface
@@ -20,10 +20,10 @@ SourceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>480</x>
-      <y>640</y>
-      <w>380</w>
-      <h>120</h>
+      <x>440</x>
+      <y>600</y>
+      <w>304</w>
+      <h>96</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 DispatcherInterface
@@ -35,10 +35,10 @@ DispatcherInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>490</x>
-      <y>1180</y>
-      <w>370</w>
-      <h>80</h>
+      <x>448</x>
+      <y>1032</y>
+      <w>296</w>
+      <h>64</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 TargetInterface
@@ -49,10 +49,10 @@ TargetInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1090</x>
-      <y>650</y>
-      <w>130</w>
-      <h>30</h>
+      <x>928</x>
+      <y>608</y>
+      <w>104</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>Dispatcher
 </panel_attributes>
@@ -61,10 +61,10 @@ TargetInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>850</x>
-      <y>650</y>
-      <w>260</w>
-      <h>30</h>
+      <x>736</x>
+      <y>608</y>
+      <w>208</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;240.0;10.0</additional_attributes>
@@ -72,10 +72,10 @@ TargetInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1070</x>
-      <y>1210</y>
-      <w>100</w>
-      <h>30</h>
+      <x>912</x>
+      <y>1056</y>
+      <w>80</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>MapOverlay</panel_attributes>
     <additional_attributes/>
@@ -83,10 +83,10 @@ TargetInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>850</x>
-      <y>1210</y>
-      <w>240</w>
-      <h>30</h>
+      <x>736</x>
+      <y>1056</y>
+      <w>192</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;220.0;10.0</additional_attributes>
@@ -94,10 +94,10 @@ TargetInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>750</y>
-      <w>30</w>
-      <h>450</h>
+      <x>600</x>
+      <y>688</y>
+      <w>24</w>
+      <h>360</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;430.0;10.0;10.0</additional_attributes>
@@ -105,10 +105,10 @@ TargetInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>810</x>
-      <y>860</y>
-      <w>70</w>
-      <h>340</h>
+      <x>704</x>
+      <y>776</y>
+      <w>56</w>
+      <h>272</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;320.0;10.0;10.0;50.0;10.0</additional_attributes>
@@ -116,10 +116,10 @@ TargetInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1100</x>
-      <y>340</y>
-      <w>120</w>
-      <h>30</h>
+      <x>936</x>
+      <y>360</y>
+      <w>96</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>FileSource
 </panel_attributes>
@@ -128,10 +128,10 @@ TargetInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1360</x>
-      <y>580</y>
-      <w>280</w>
-      <h>110</h>
+      <x>1144</x>
+      <y>552</y>
+      <w>224</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 UsageTrackerInterface
@@ -143,10 +143,10 @@ UsageTrackerInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1010</x>
-      <y>680</y>
-      <w>420</w>
-      <h>280</h>
+      <x>864</x>
+      <y>632</y>
+      <w>336</w>
+      <h>224</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>400.0;10.0;400.0;260.0;10.0;260.0</additional_attributes>
@@ -154,10 +154,10 @@ UsageTrackerInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>850</x>
-      <y>340</y>
-      <w>270</w>
-      <h>30</h>
+      <x>736</x>
+      <y>360</y>
+      <w>216</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;250.0;10.0</additional_attributes>
@@ -165,10 +165,10 @@ UsageTrackerInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>480</x>
-      <y>450</y>
-      <w>380</w>
-      <h>110</h>
+      <x>440</x>
+      <y>448</y>
+      <w>304</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 EmiterInterface
@@ -180,10 +180,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>370</y>
-      <w>30</w>
-      <h>100</h>
+      <x>600</x>
+      <y>384</y>
+      <w>24</w>
+      <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;80.0;10.0;10.0</additional_attributes>
@@ -191,10 +191,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>680</x>
-      <y>550</y>
-      <w>30</w>
-      <h>110</h>
+      <x>600</x>
+      <y>528</y>
+      <w>24</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;90.0</additional_attributes>
@@ -202,10 +202,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>310</x>
-      <y>320</y>
-      <w>200</w>
-      <h>930</h>
+      <x>304</x>
+      <y>344</y>
+      <w>160</w>
+      <h>744</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>180.0;910.0;10.0;910.0;10.0;10.0;170.0;10.0</additional_attributes>
@@ -213,10 +213,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>640</x>
-      <y>750</y>
-      <w>30</w>
-      <h>450</h>
+      <x>568</x>
+      <y>688</y>
+      <w>24</w>
+      <h>360</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>10.0;430.0;10.0;10.0</additional_attributes>
@@ -224,10 +224,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1840</x>
-      <y>880</y>
-      <w>270</w>
-      <h>140</h>
+      <x>1528</x>
+      <y>792</y>
+      <w>216</w>
+      <h>112</h>
     </coordinates>
     <panel_attributes>OverlayController
 -
@@ -241,10 +241,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1870</x>
-      <y>690</y>
-      <w>250</w>
-      <h>130</h>
+      <x>1552</x>
+      <y>640</y>
+      <w>200</w>
+      <h>104</h>
     </coordinates>
     <panel_attributes>DetailController
 -
@@ -256,10 +256,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>880</x>
-      <y>820</y>
-      <w>100</w>
-      <h>80</h>
+      <x>760</x>
+      <y>744</y>
+      <w>80</w>
+      <h>64</h>
     </coordinates>
     <panel_attributes>ToggleFilter
 -</panel_attributes>
@@ -268,10 +268,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1100</x>
-      <y>150</y>
-      <w>130</w>
-      <h>30</h>
+      <x>936</x>
+      <y>208</y>
+      <w>104</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>/SolidOverlayFile/
 </panel_attributes>
@@ -280,10 +280,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1150</x>
-      <y>170</y>
-      <w>30</w>
-      <h>80</h>
+      <x>976</x>
+      <y>224</y>
+      <w>24</w>
+      <h>64</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
@@ -291,10 +291,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1100</x>
-      <y>400</y>
-      <w>120</w>
-      <h>90</h>
+      <x>936</x>
+      <y>408</y>
+      <w>96</w>
+      <h>72</h>
     </coordinates>
     <panel_attributes>EditorSource
 -
@@ -304,10 +304,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>530</x>
-      <y>80</y>
-      <w>150</w>
-      <h>30</h>
+      <x>480</x>
+      <y>152</y>
+      <w>120</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>TrackerTimerSource</panel_attributes>
     <additional_attributes/>
@@ -315,10 +315,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>820</x>
-      <y>370</y>
-      <w>300</w>
-      <h>60</h>
+      <x>712</x>
+      <y>384</y>
+      <w>240</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;40.0;280.0;40.0</additional_attributes>
@@ -326,10 +326,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1100</x>
-      <y>550</y>
-      <w>180</w>
-      <h>70</h>
+      <x>936</x>
+      <y>528</y>
+      <w>144</w>
+      <h>56</h>
     </coordinates>
     <panel_attributes>EditorSourceController
 -
@@ -340,10 +340,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1140</x>
-      <y>480</y>
-      <w>30</w>
-      <h>90</h>
+      <x>968</x>
+      <y>472</y>
+      <w>24</w>
+      <h>72</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
@@ -351,10 +351,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>500</x>
-      <y>60</y>
-      <w>350</w>
-      <h>150</h>
+      <x>456</x>
+      <y>136</y>
+      <w>280</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes/>
     <additional_attributes/>
@@ -362,10 +362,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>670</x>
-      <y>200</y>
-      <w>30</w>
-      <h>100</h>
+      <x>592</x>
+      <y>248</y>
+      <w>24</w>
+      <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;80.0;10.0;10.0</additional_attributes>
@@ -373,10 +373,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>530</x>
-      <y>120</y>
-      <w>150</w>
-      <h>30</h>
+      <x>480</x>
+      <y>184</y>
+      <w>120</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>TrackerSource</panel_attributes>
     <additional_attributes/>
@@ -384,10 +384,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>530</x>
-      <y>160</y>
-      <w>180</w>
-      <h>30</h>
+      <x>480</x>
+      <y>216</y>
+      <w>144</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>CurrentLocationSource</panel_attributes>
     <additional_attributes/>
@@ -395,10 +395,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>690</x>
-      <y>120</y>
-      <w>150</w>
-      <h>30</h>
+      <x>608</x>
+      <y>184</y>
+      <w>120</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>SensorSource</panel_attributes>
     <additional_attributes/>
@@ -406,10 +406,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>690</x>
-      <y>80</y>
-      <w>150</w>
-      <h>30</h>
+      <x>608</x>
+      <y>152</y>
+      <w>120</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>IteratorSource</panel_attributes>
     <additional_attributes/>
@@ -417,10 +417,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1240</x>
-      <y>230</y>
-      <w>130</w>
-      <h>30</h>
+      <x>1048</x>
+      <y>272</y>
+      <w>104</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>FileViewSource</panel_attributes>
     <additional_attributes/>
@@ -428,10 +428,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1150</x>
-      <y>250</y>
-      <w>30</w>
-      <h>110</h>
+      <x>976</x>
+      <y>288</y>
+      <w>24</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;90.0;10.0;10.0</additional_attributes>
@@ -439,10 +439,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1100</x>
-      <y>230</y>
-      <w>130</w>
-      <h>30</h>
+      <x>936</x>
+      <y>272</y>
+      <w>104</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>OverlaySource</panel_attributes>
     <additional_attributes/>
@@ -450,10 +450,10 @@ EmiterInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1190</x>
-      <y>250</y>
-      <w>130</w>
-      <h>110</h>
+      <x>1008</x>
+      <y>288</y>
+      <w>104</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;90.0;10.0;60.0;110.0;60.0;110.0;10.0</additional_attributes>
@@ -461,10 +461,10 @@ EmiterInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>0</x>
-      <y>460</y>
-      <w>240</w>
-      <h>110</h>
+      <x>56</x>
+      <y>456</y>
+      <w>192</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>&lt;&lt;interface&gt;&gt;
 LifeCylceInterface
@@ -478,10 +478,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>230</x>
-      <y>500</y>
-      <w>270</w>
-      <h>30</h>
+      <x>240</x>
+      <y>488</y>
+      <w>216</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;250.0;10.0</additional_attributes>
@@ -489,10 +489,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>830</x>
-      <y>970</y>
-      <w>50</w>
-      <h>230</h>
+      <x>720</x>
+      <y>864</y>
+      <w>40</w>
+      <h>184</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>10.0;210.0;10.0;10.0;30.0;10.0</additional_attributes>
@@ -500,10 +500,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1210</x>
-      <y>350</y>
-      <w>220</w>
-      <h>250</h>
+      <x>1024</x>
+      <y>368</y>
+      <w>176</w>
+      <h>200</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>200.0;230.0;200.0;10.0;10.0;10.0</additional_attributes>
@@ -511,10 +511,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1460</x>
-      <y>680</y>
-      <w>30</w>
-      <h>320</h>
+      <x>1224</x>
+      <y>632</y>
+      <w>24</w>
+      <h>256</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;300.0</additional_attributes>
@@ -522,10 +522,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1610</x>
-      <y>680</y>
-      <w>30</w>
-      <h>320</h>
+      <x>1344</x>
+      <y>632</y>
+      <w>24</w>
+      <h>256</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;300.0</additional_attributes>
@@ -533,10 +533,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1330</x>
-      <y>980</y>
-      <w>190</w>
-      <h>60</h>
+      <x>1120</x>
+      <y>872</y>
+      <w>152</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>OverlayUsageTracker
 </panel_attributes>
@@ -545,10 +545,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1540</x>
-      <y>980</y>
-      <w>190</w>
-      <h>60</h>
+      <x>1288</x>
+      <y>872</y>
+      <w>152</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>SelectableUsageTracker
 -
@@ -558,10 +558,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1330</x>
-      <y>1090</y>
-      <w>190</w>
-      <h>30</h>
+      <x>1120</x>
+      <y>960</y>
+      <w>152</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>/SolidOverlayFileEnabled/
 </panel_attributes>
@@ -570,10 +570,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1460</x>
-      <y>1030</y>
-      <w>30</w>
-      <h>80</h>
+      <x>1224</x>
+      <y>912</y>
+      <w>24</w>
+      <h>64</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>10.0;60.0;10.0;10.0</additional_attributes>
@@ -581,10 +581,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1570</x>
-      <y>400</y>
-      <w>30</w>
-      <h>200</h>
+      <x>1312</x>
+      <y>408</y>
+      <w>24</w>
+      <h>160</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;180.0;10.0;10.0</additional_attributes>
@@ -592,10 +592,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1510</x>
-      <y>360</y>
-      <w>190</w>
-      <h>50</h>
+      <x>1264</x>
+      <y>376</y>
+      <w>152</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>UsageTrackers
 </panel_attributes>
@@ -604,10 +604,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1550</x>
-      <y>680</y>
-      <w>30</w>
-      <h>140</h>
+      <x>1296</x>
+      <y>632</y>
+      <w>24</w>
+      <h>112</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;120.0</additional_attributes>
@@ -615,10 +615,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1480</x>
-      <y>800</y>
-      <w>130</w>
-      <h>60</h>
+      <x>1240</x>
+      <y>728</y>
+      <w>104</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>UsageTracker
 </panel_attributes>
@@ -627,10 +627,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1550</x>
-      <y>850</y>
-      <w>30</w>
-      <h>150</h>
+      <x>1296</x>
+      <y>768</y>
+      <w>24</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>lt=&lt;.</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;130.0</additional_attributes>
@@ -638,10 +638,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1600</x>
-      <y>400</y>
-      <w>30</w>
-      <h>200</h>
+      <x>1336</x>
+      <y>408</y>
+      <w>24</w>
+      <h>160</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-</panel_attributes>
     <additional_attributes>10.0;10.0;10.0;180.0</additional_attributes>
@@ -649,10 +649,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>880</x>
-      <y>920</y>
-      <w>100</w>
-      <h>80</h>
+      <x>760</x>
+      <y>824</y>
+      <w>80</w>
+      <h>64</h>
     </coordinates>
     <panel_attributes>SelectFilter
 -</panel_attributes>
@@ -661,10 +661,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>860</x>
-      <y>800</y>
-      <w>160</w>
-      <h>210</h>
+      <x>744</x>
+      <y>728</y>
+      <w>128</w>
+      <h>168</h>
     </coordinates>
     <panel_attributes/>
     <additional_attributes/>
@@ -672,10 +672,10 @@ LifeCylceInterface
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>920</x>
-      <y>230</y>
-      <w>160</w>
-      <h>30</h>
+      <x>792</x>
+      <y>272</y>
+      <w>128</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>FixedOverlaySource</panel_attributes>
     <additional_attributes/>
@@ -683,10 +683,10 @@ LifeCylceInterface
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>990</x>
-      <y>250</y>
-      <w>150</w>
-      <h>110</h>
+      <x>848</x>
+      <y>288</y>
+      <w>120</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
     <additional_attributes>130.0;90.0;130.0;60.0;10.0;60.0;10.0;10.0</additional_attributes>