National: minor layout improvements.