Added image to menu. Changed metrics. Added values-v21