Feature/offline_settings