Updated location and minor layout changes