Safely unwrap optional before saving to cloud. UI improvements.