Focus tweaks + modal updates
Mergin remote