Sync and SQLite: We are almost there (merging not possible yet)
UI: Small improvements