Added snapshot, removed picture, cleaned up size, etc