Merge with Asaf's changes

Asaf changes:
- UI (not finished)
- Dialog if not connected to GPS & Network