Sync with repo.
Activities model and storage
Improved UI design