Adding content and minor layout changes