minor layout and validity changes